Hello community,
here is the log from the commit of package gnome-panel
checked in at Thu Oct 12 22:02:22 CEST 2006.
--------
--- GNOME/gnome-panel/gnome-panel.changes 2006-10-03 18:06:36.000000000 +0200
+++ /mounts/work_src_done/STABLE/gnome-panel/gnome-panel.changes 2006-10-12 19:53:09.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Oct 12 19:52:32 CEST 2006 - danw@suse.de
+
+- Update and reenable gnome-panel-run-fixes.patch (#202076)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-panel.spec ++++++
--- /var/tmp/diff_new_pack.Eu0Bey/_old 2006-10-12 22:01:41.000000000 +0200
+++ /var/tmp/diff_new_pack.Eu0Bey/_new 2006-10-12 22:01:41.000000000 +0200
@@ -18,7 +18,7 @@
Group: System/GUI/GNOME
Autoreqprov: on
Version: 2.16.1
-Release: 1
+Release: 3
Summary: The GNOME 2.x Desktop Panel
Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.11/gnome-panel-%{version}.tar.bz2
URL: http://www.gnome.org
@@ -243,7 +243,7 @@
%patch43
#%patch46
%patch48
-#%patch50
+%patch50
%patch51 -p1
%patch52
# this is for the gnome-panel-corners.patch
@@ -378,6 +378,8 @@
%{prefix}/share/gnome-2.0/ui/GNOME_FishApplet.xml
%changelog -n gnome-panel
+* Thu Oct 12 2006 - danw@suse.de
+- Update and reenable gnome-panel-run-fixes.patch (#202076)
* Tue Oct 03 2006 - jhargadon@suse.de
- update to version 2.16.1
- Fix crash when alacarte isn't installed
++++++ gnome-panel-run-fixes.patch ++++++
--- /var/tmp/diff_new_pack.Eu0Bey/_old 2006-10-12 22:01:42.000000000 +0200
+++ /var/tmp/diff_new_pack.Eu0Bey/_new 2006-10-12 22:01:42.000000000 +0200
@@ -1,27 +1,12 @@
Index: gnome-panel/panel-run-dialog.c
-================================================================================
---- gnome-panel/panel-run-dialog.c
-+++ gnome-panel/panel-run-dialog.c
-@@ -96,7 +96,7 @@
- gboolean completion_started;
-
- char *icon_path;
-- char *item_name;
-+ char *item_path;
- } PanelRunDialog;
-
- enum {
-@@ -126,7 +126,7 @@
- dialog->add_icon_paths = NULL;
-
- g_free (dialog->icon_path);
-- g_free (dialog->item_name);
-+ g_free (dialog->item_path);
-
- if (dialog->add_icons_idle_id)
- g_source_remove (dialog->add_icons_idle_id);
-@@ -259,6 +259,101 @@
- return TRUE;
+===================================================================
+RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-run-dialog.c,v
+retrieving revision 1.72
+diff -u -p -r1.72 panel-run-dialog.c
+--- gnome-panel/panel-run-dialog.c 7 Aug 2006 21:07:46 -0000 1.72
++++ gnome-panel/panel-run-dialog.c 12 Oct 2006 17:51:16 -0000
+@@ -223,6 +223,104 @@ panel_run_dialog_set_icon (PanelRunDialo
+ }
}
+static char *
@@ -68,28 +53,27 @@
+
+static gboolean
+panel_run_dialog_launch_ditem (PanelRunDialog *dialog,
-+ const char *ditem_path,
++ const char *desktop_path,
+ const char *command,
+ const char *escaped)
+{
-+ GdkScreen *screen;
+ GnomeDesktopItem *ditem;
+ int result;
+ char *merged_command;
+ GError *error = NULL;
+
-+ screen = gtk_window_get_screen (GTK_WINDOW (dialog->run_dialog));
-+
-+ ditem = gnome_desktop_item_new_from_file (ditem_path,
++ ditem = gnome_desktop_item_new_from_file (desktop_path,
+ GNOME_DESKTOP_ITEM_LOAD_ONLY_IF_EXISTS,
+ &error);
+ if (!ditem) {
-+ panel_error_dialog (screen, "cannot_open_desktop_item", TRUE,
-+ _("Cannot open desktop item '%s'"),
-+ "%s",
-+ ditem_path,
-+ error->message);
++ char *primary;
+
++ primary = g_strdup_printf (_("Cannot open desktop item '%s'"),
++ desktop_path);
++ panel_error_dialog (GTK_WINDOW (dialog->run_dialog), NULL,
++ "cannot_open_desktop_item", TRUE,
++ primary, error->message);
++ g_free (primary);
+ g_error_free (error);
+ return FALSE;
+ }
@@ -105,14 +89,18 @@
+ "true");
+ }
+
-+ result = panel_ditem_launch (ditem, NULL, 0, screen, &error);
++ result = panel_ditem_launch (ditem, NULL,
++ gtk_window_get_screen (GTK_WINDOW (dialog->run_dialog)),
++ &error);
+ if (result == -1) {
-+ panel_error_dialog (screen, "cannot_spawn_command", TRUE,
-+ _("Cannot launch command '%s'"),
-+ "%s",
-+ escaped,
-+ error->message);
++ char *primary;
+
++ primary = g_strdup_printf (_("Cannot launch command '%s'"),
++ escaped);
++ panel_error_dialog (GTK_WINDOW (dialog->run_dialog), NULL,
++ "cannot_spawn_command", TRUE,
++ primary, error->message);
++ g_free (primary);
+ g_error_free (error);
+ }
+
@@ -120,16 +108,16 @@
+}
+
static gboolean
- panel_run_dialog_launch_command (PanelRunDialog *dialog,
- const char *command,
-@@ -389,8 +484,12 @@
+ command_is_executable (const char *command)
+ {
+@@ -402,8 +500,12 @@ panel_run_dialog_execute (PanelRunDialog
scheme = gnome_vfs_get_uri_scheme (url);
result = FALSE;
- if (!g_ascii_strcasecmp (scheme, "http") ||
- !g_ascii_strcasecmp (scheme, "file"))
-+ if (dialog->item_path)
-+ result = panel_run_dialog_launch_ditem (dialog, dialog->item_path, disk, escaped);
++ if (dialog->desktop_path)
++ result = panel_run_dialog_launch_ditem (dialog, dialog->desktop_path, disk, escaped);
+
+ if (!result &&
+ (!g_ascii_strcasecmp (scheme, "http") ||
@@ -137,124 +125,93 @@
/* If this returns an http or file url, the url might refer to a
* command that is somewhere in the path or an executable file.
* So try executing it before displaying it. We execute the
-@@ -574,14 +673,14 @@
- GtkTreePath *path;
+@@ -588,6 +690,7 @@ panel_run_dialog_find_command_idle (Pane
const char *text;
char *found_icon;
-- char *found_name;
-+ char *found_ditem;
+ char *found_name;
++ char *found_path;
gboolean fuzzy;
model = GTK_TREE_MODEL (dialog->program_list_store);
- path = gtk_tree_path_new_first ();
+@@ -595,6 +698,7 @@ panel_run_dialog_find_command_idle (Pane
text = sure_string (gtk_entry_get_text (GTK_ENTRY (dialog->gtk_entry)));
found_icon = NULL;
-- found_name = NULL;
-+ found_ditem = NULL;
+ found_name = NULL;
++ found_path = NULL;
fuzzy = FALSE;
if (!path || !gtk_tree_model_get_iter (model, &iter, path)) {
-@@ -610,10 +709,10 @@
+@@ -612,12 +716,14 @@ panel_run_dialog_find_command_idle (Pane
+ char *icon = NULL;
+ char *name = NULL;
+ char *comment = NULL;
++ char *desktop_path = NULL;
+
+ gtk_tree_model_get (model, &iter,
+ COLUMN_EXEC, &exec,
+ COLUMN_ICON_FILE, &icon,
+ COLUMN_NAME, &name,
+ COLUMN_COMMENT, &comment,
++ COLUMN_PATH, &desktop_path,
+ -1);
+
if (!fuzzy && exec && icon &&
- fuzzy_command_match (text, exec, &fuzzy)) {
- g_free (found_icon);
-- g_free (found_name);
-+ g_free (found_ditem);
+@@ -627,6 +733,7 @@ panel_run_dialog_find_command_idle (Pane
found_icon = g_strdup (icon);
-- found_name = g_strdup (name);
-+ found_ditem = g_strdup (name);
+ found_name = g_strdup (name);
++ found_path = g_strdup (desktop_path);
gtk_list_store_set (dialog->program_list_store,
&iter,
-@@ -638,6 +737,9 @@
- g_free (name);
- g_free (comment);
-
-+ if (found_ditem && !fuzzy)
-+ break;
-+
- } while (gtk_tree_model_iter_next (model, &iter));
-
- if (gtk_tree_model_get_iter (gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->program_list)),
-@@ -652,8 +754,8 @@
-
- g_free (found_icon);
+@@ -667,6 +774,8 @@ panel_run_dialog_find_command_idle (Pane
-- g_free (dialog->item_name);
-- dialog->item_name = found_name;
-+ g_free (dialog->item_path);
-+ dialog->item_path = found_ditem;
- //FIXME err... why is this useful??? don't we want the .desktop path for dnd?
+ g_free (dialog->item_name);
+ dialog->item_name = found_name;
++ g_free (dialog->desktop_path);
++ dialog->desktop_path = found_path;
dialog->find_command_idle_id = 0;
-@@ -1005,13 +1107,10 @@
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->terminal_checkbox),
- terminal);
-
-- if (dialog->item_name)
-- g_free (dialog->item_name);
--
-- dialog->item_name = g_strdup (gnome_desktop_item_get_string (
-- ditem,
-- GNOME_DESKTOP_ITEM_NAME));
--
-+ if (dialog->item_path)
-+ g_free (dialog->item_path);
-+ dialog->item_path = g_strdup (path);
-+
- gnome_desktop_item_unref (ditem);
- }
-
-@@ -1523,9 +1622,9 @@
- start++;
-
- /* update item name to use for dnd */
-- if (!dialog->use_program_list && dialog->item_name) {
-- g_free (dialog->item_name);
-- dialog->item_name = NULL;
-+ if (!dialog->use_program_list && dialog->item_path) {
-+ g_free (dialog->item_path);
-+ dialog->item_path = NULL;
- }
-
- /* desensitize run button if no text entered */
-@@ -1692,7 +1791,10 @@
- if (!text || !text [0])
- return;
-
-- ditem = gnome_desktop_item_new ();
-+ if (dialog->item_path)
-+ ditem = gnome_desktop_item_new_from_file (dialog->item_path, 0, NULL);
-+ else
-+ ditem = gnome_desktop_item_new ();
-
- disk = g_locale_from_utf8 (text, -1, NULL, NULL, NULL);
- uri = gnome_vfs_make_uri_from_input_with_dirs (disk,
-@@ -1713,18 +1815,20 @@
- gnome_desktop_item_set_string (ditem, GNOME_DESKTOP_ITEM_URL, uri);
- }
-
-- gnome_desktop_item_set_string (ditem,
-- GNOME_DESKTOP_ITEM_NAME, (dialog->item_name) ?
-- dialog->item_name : text);
-+ if (!dialog->item_path) {
-+ gnome_desktop_item_set_string (ditem,
-+ GNOME_DESKTOP_ITEM_NAME,
-+ text);
-+ gnome_desktop_item_set_string (ditem,
-+ GNOME_DESKTOP_ITEM_ICON,
-+ dialog->icon_path);
-+ }
-
- gnome_desktop_item_set_boolean (ditem,
- GNOME_DESKTOP_ITEM_TERMINAL,
- gtk_toggle_button_get_active (
- GTK_TOGGLE_BUTTON (dialog->terminal_checkbox)));
-
-- gnome_desktop_item_set_string (ditem,
-- GNOME_DESKTOP_ITEM_ICON,
-- dialog->icon_path);
-
- g_free (uri);
+ return FALSE;
+Index: gnome-panel/panel-util.c
+===================================================================
+RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-util.c,v
+retrieving revision 1.169
+diff -u -p -r1.169 panel-util.c
+--- gnome-panel/panel-util.c 6 Sep 2006 17:39:01 -0000 1.169
++++ gnome-panel/panel-util.c 12 Oct 2006 17:51:16 -0000
+@@ -35,7 +35,7 @@
+ #include "panel-globals.h"
+ #include "launcher.h"
+
+-static int
++int
+ panel_ditem_launch (GnomeDesktopItem *item,
+ GList *file_list,
+ GdkScreen *screen,
+Index: gnome-panel/panel-util.h
+===================================================================
+RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-util.h,v
+retrieving revision 1.94
+diff -u -p -r1.94 panel-util.h
+--- gnome-panel/panel-util.h 9 Aug 2006 14:02:12 -0000 1.94
++++ gnome-panel/panel-util.h 12 Oct 2006 17:51:16 -0000
+@@ -2,6 +2,7 @@
+ #define PANEL_UTIL_H
+
+ #include
participants (1)
-
root@suse.de