rpms/gnome-panel/devel .cvsignore, 1.99, 1.100 bookmarks-submenu.patch, 1.1, 1.2 desktop-file-monitoring.patch, 1.4, 1.5 gnome-panel.spec, 1.372, 1.373 launcher-desktop-files.patch, 1.3, 1.4 sources, 1.102, 1.103
Matthias Clasen
mclasen at fedoraproject.org
Sun Jan 17 23:40:44 UTC 2010
Author: mclasen
Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21942
Modified Files:
.cvsignore bookmarks-submenu.patch
desktop-file-monitoring.patch gnome-panel.spec
launcher-desktop-files.patch sources
Log Message:
2.29.5.1
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/.cvsignore,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- .cvsignore 24 Sep 2009 00:34:44 -0000 1.99
+++ .cvsignore 17 Jan 2010 23:40:43 -0000 1.100
@@ -1 +1 @@
-gnome-panel-2.28.0.tar.bz2
+gnome-panel-2.29.5.1.tar.bz2
bookmarks-submenu.patch:
panel-menu-items.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: bookmarks-submenu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/bookmarks-submenu.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bookmarks-submenu.patch 2 Nov 2009 04:45:40 -0000 1.1
+++ bookmarks-submenu.patch 17 Jan 2010 23:40:43 -0000 1.2
@@ -1,12 +1,12 @@
-diff -up gnome-panel-2.28.0/gnome-panel/panel-menu-items.c.bookmarks-submenu gnome-panel-2.28.0/gnome-panel/panel-menu-items.c
---- gnome-panel-2.28.0/gnome-panel/panel-menu-items.c.bookmarks-submenu 2009-10-08 00:52:51.855737118 -0400
-+++ gnome-panel-2.28.0/gnome-panel/panel-menu-items.c 2009-10-08 00:53:09.378716600 -0400
+diff -up gnome-panel-2.29.5.1/gnome-panel/panel-menu-items.c.bookmarks-submenu gnome-panel-2.29.5.1/gnome-panel/panel-menu-items.c
+--- gnome-panel-2.29.5.1/gnome-panel/panel-menu-items.c.bookmarks-submenu 2010-01-17 18:19:36.000000000 -0500
++++ gnome-panel-2.29.5.1/gnome-panel/panel-menu-items.c 2010-01-17 18:21:00.466529924 -0500
@@ -61,7 +61,7 @@
#define NAMES_DIR "/apps/nautilus/desktop"
#define HOME_NAME_KEY "/apps/nautilus/desktop/home_icon_name"
#define COMPUTER_NAME_KEY "/apps/nautilus/desktop/computer_icon_name"
-#define MAX_ITEMS_OR_SUBMENU 5
+#define MAX_ITEMS_OR_SUBMENU 8
+ #define MAX_BOOKMARK_ITEMS 100
G_DEFINE_TYPE (PanelPlaceMenuItem, panel_place_menu_item, GTK_TYPE_IMAGE_MENU_ITEM)
- G_DEFINE_TYPE (PanelDesktopMenuItem, panel_desktop_menu_item, GTK_TYPE_IMAGE_MENU_ITEM)
desktop-file-monitoring.patch:
launcher.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++
launcher.h | 3 -
panel-ditem-editor.c | 30 ++++++++++++++
panel-ditem-editor.h | 2
4 files changed, 139 insertions(+), 1 deletion(-)
Index: desktop-file-monitoring.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/desktop-file-monitoring.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- desktop-file-monitoring.patch 18 Jun 2008 21:31:13 -0000 1.4
+++ desktop-file-monitoring.patch 17 Jan 2010 23:40:43 -0000 1.5
@@ -1,39 +1,7 @@
-diff -up gnome-panel-2.21.91/gnome-panel/launcher.h.desktop-file-monitoring gnome-panel-2.21.91/gnome-panel/launcher.h
---- gnome-panel-2.21.91/gnome-panel/launcher.h.desktop-file-monitoring 2008-02-11 16:15:47.000000000 -0500
-+++ gnome-panel-2.21.91/gnome-panel/launcher.h 2008-02-13 17:50:59.000000000 -0500
-@@ -29,6 +29,8 @@ typedef struct {
- GSList *error_dialogs;
-
- gulong destroy_handler;
-+
-+ GFileMonitor *monitor;
- } Launcher;
-
- void panel_launcher_create (PanelToplevel *toplevel,
-@@ -58,7 +60,6 @@ void launcher_load_from_gconf
- gint position,
- const char *id);
-
--void panel_launcher_delete (Launcher *launcher);
-
- void ask_about_launcher (const char *file,
- PanelWidget *panel,
-diff -up gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.h
---- gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring 2008-02-11 16:15:47.000000000 -0500
-+++ gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.h 2008-02-13 17:34:43.000000000 -0500
-@@ -101,6 +101,8 @@ void panel_ditem_editor_set_uri (PanelDI
- const char *uri);
-
- G_CONST_RETURN char *panel_ditem_editor_get_uri (PanelDItemEditor *dialog);
-+G_CONST_RETURN char *panel_ditem_editor_get_orig_desktop_file (PanelDItemEditor *dialog);
-+
-
- void panel_ditem_register_save_uri_func (PanelDItemEditor *dialog,
- PanelDitemSaveUri save_uri,
-diff -up gnome-panel-2.21.91/gnome-panel/launcher.c.desktop-file-monitoring gnome-panel-2.21.91/gnome-panel/launcher.c
---- gnome-panel-2.21.91/gnome-panel/launcher.c.desktop-file-monitoring 2008-02-11 16:15:47.000000000 -0500
-+++ gnome-panel-2.21.91/gnome-panel/launcher.c 2008-02-13 18:04:07.000000000 -0500
-@@ -307,6 +307,8 @@ static void
+diff -up gnome-panel-2.29.5.1/gnome-panel/launcher.c.desktop-file-monitoring gnome-panel-2.29.5.1/gnome-panel/launcher.c
+--- gnome-panel-2.29.5.1/gnome-panel/launcher.c.desktop-file-monitoring 2010-01-13 22:26:27.000000000 -0500
++++ gnome-panel-2.29.5.1/gnome-panel/launcher.c 2010-01-17 18:06:14.640537280 -0500
+@@ -237,6 +237,8 @@ static void
destroy_launcher (GtkWidget *widget,
Launcher *launcher)
{
@@ -42,7 +10,7 @@ diff -up gnome-panel-2.21.91/gnome-panel
launcher_properties_destroy (launcher);
launcher_widget_destroy_open_dialogs (launcher);
}
-@@ -488,6 +490,37 @@ drag_data_get_cb (GtkWidget *widg
+@@ -410,6 +412,37 @@ drag_data_get_cb (GtkWidget *widg
}
@@ -80,7 +48,7 @@ diff -up gnome-panel-2.21.91/gnome-panel
static Launcher *
create_launcher (const char *location)
{
-@@ -564,6 +597,21 @@ create_launcher (const char *location)
+@@ -482,6 +515,21 @@ create_launcher (const char *location)
launcher->key_file = key_file;
launcher->prop_dialog = NULL;
launcher->destroy_handler = 0;
@@ -102,7 +70,7 @@ diff -up gnome-panel-2.21.91/gnome-panel
/* Icon will be setup later */
launcher->button = button_widget_new (NULL /* icon */,
-@@ -694,6 +742,15 @@ static void
+@@ -612,6 +660,15 @@ static void
launcher_changed (PanelDItemEditor *dialog,
Launcher *launcher)
{
@@ -118,7 +86,7 @@ diff -up gnome-panel-2.21.91/gnome-panel
/* Setup the button look */
setup_button (launcher);
}
-@@ -765,6 +822,42 @@ launcher_save_uri (PanelDItemEditor *dia
+@@ -681,6 +738,42 @@ launcher_save_uri (PanelDItemEditor *dia
return NULL;
}
@@ -161,7 +129,7 @@ diff -up gnome-panel-2.21.91/gnome-panel
static void
launcher_saved (GtkWidget *dialog,
Launcher *launcher)
-@@ -772,11 +865,15 @@ launcher_saved (GtkWidget *dialog,
+@@ -688,11 +781,15 @@ launcher_saved (GtkWidget *dialog,
const char *uri;
GConfClient *client;
const char *key;
@@ -177,7 +145,7 @@ diff -up gnome-panel-2.21.91/gnome-panel
if (uri && launcher->location && strcmp (uri, launcher->location)) {
client = panel_gconf_get_client ();
-@@ -789,6 +886,9 @@ launcher_saved (GtkWidget *dialog,
+@@ -705,6 +802,9 @@ launcher_saved (GtkWidget *dialog,
if (launcher->location)
g_free (launcher->location);
launcher->location = g_strdup (uri);
@@ -187,7 +155,7 @@ diff -up gnome-panel-2.21.91/gnome-panel
}
}
-@@ -955,6 +1055,7 @@ launcher_new_saved (GtkWidget *dialog,
+@@ -871,6 +971,7 @@ launcher_new_saved (GtkWidget *dialog,
PanelWidget *panel;
int pos;
const char *uri;
@@ -195,7 +163,7 @@ diff -up gnome-panel-2.21.91/gnome-panel
pos = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), "pos"));
panel = g_object_get_data (G_OBJECT (dialog), "panel");
-@@ -962,6 +1063,10 @@ launcher_new_saved (GtkWidget *dialog,
+@@ -878,6 +979,10 @@ launcher_new_saved (GtkWidget *dialog,
uri = panel_ditem_editor_get_uri (PANEL_DITEM_EDITOR (dialog));
if (panel_launcher_get_filename (uri) != NULL)
uri = panel_launcher_get_filename (uri);
@@ -206,21 +174,41 @@ diff -up gnome-panel-2.21.91/gnome-panel
panel_launcher_create (panel->toplevel, pos, uri);
}
-diff -up gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.c
---- gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring 2008-02-13 17:34:43.000000000 -0500
-+++ gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.c 2008-02-13 17:34:43.000000000 -0500
-@@ -80,6 +80,8 @@ struct _PanelDItemEditorPrivate
+diff -up gnome-panel-2.29.5.1/gnome-panel/launcher.h.desktop-file-monitoring gnome-panel-2.29.5.1/gnome-panel/launcher.h
+--- gnome-panel-2.29.5.1/gnome-panel/launcher.h.desktop-file-monitoring 2009-04-19 13:45:09.000000000 -0400
++++ gnome-panel-2.29.5.1/gnome-panel/launcher.h 2010-01-17 18:06:14.638537025 -0500
+@@ -27,6 +27,8 @@ typedef struct {
+ GSList *error_dialogs;
- /* the directory of the theme for the icon, see bug #119208 */
- char *icon_theme_dir;
+ gulong destroy_handler;
+
-+ char *orig_desktop_file;
++ GFileMonitor *monitor;
+ } Launcher;
+
+ void panel_launcher_create (PanelToplevel *toplevel,
+@@ -56,7 +58,6 @@ void launcher_load_from_gconf
+ gint position,
+ const char *id);
+
+-void panel_launcher_delete (Launcher *launcher);
+
+ void ask_about_launcher (const char *file,
+ PanelWidget *panel,
+diff -up gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c
+--- gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring 2010-01-17 18:06:14.635278719 -0500
++++ gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c 2010-01-17 18:11:39.921279627 -0500
+@@ -81,6 +81,8 @@ struct _PanelDItemEditorPrivate
+ GtkWidget *close_button;
+ GtkWidget *cancel_button;
+ GtkWidget *ok_button;
++
++ char *orig_Desktop_file;
};
/* Time in seconds after which we save the file on the disk */
-@@ -367,6 +369,10 @@ panel_ditem_editor_destroy (GtkObject *o
- g_free (dialog->priv->icon_theme_dir);
- dialog->priv->icon_theme_dir = NULL;
+@@ -366,6 +368,10 @@ panel_ditem_editor_destroy (GtkObject *o
+ g_free (dialog->priv->uri);
+ dialog->priv->uri = NULL;
+ if (dialog->priv->orig_desktop_file != NULL)
+ g_free (dialog->priv->orig_desktop_file);
@@ -243,21 +231,21 @@ diff -up gnome-panel-2.21.91/gnome-panel
dialog->priv->dirty = TRUE;
g_signal_emit (G_OBJECT (dialog), ditem_edit_signals[CHANGED], 0);
}
-@@ -1005,6 +1018,13 @@ update_editor_from_desktop_file (PanelDI
- */
- setup_icon_entry (dialog, icon);
-
-+ /* We set the orig_desktop_file field to let the
-+ * launcher know that the editor contents are coming
-+ * directly from a desktop file.
-+ */
-+ g_free (dialog->priv->orig_desktop_file);
-+ dialog->priv->orig_desktop_file = g_strdup (uri);
-+
- g_free (name);
- g_free (comment);
- g_free (icon);
-@@ -1079,6 +1099,7 @@ update_chooser_for_type (PanelDItemEdito
+@@ -992,6 +1005,13 @@ update_editor_from_desktop_file (PanelDI
+ */
+ setup_icon_entry (dialog, icon);
+
++ /* We set the orig_desktop_file field to let the
++ * launcher know that the editor contents are coming
++ * directly from a desktop file.
++ */
++ g_free (dialog->priv->orig_desktop_file);
++ dialog->priv->orig_desktop_file = g_strdup (uri);
++
+ g_free (name);
+ g_free (comment);
+ g_free (icon);
+@@ -1066,6 +1086,7 @@ update_chooser_for_type (PanelDItemEdito
g_assert_not_reached ();
}
@@ -265,7 +253,7 @@ diff -up gnome-panel-2.21.91/gnome-panel
chooser = dialog->priv->command_browse_filechooser;
gtk_window_set_title (GTK_WINDOW (chooser),
-@@ -1835,3 +1856,12 @@ panel_ditem_register_save_uri_func (Pane
+@@ -1849,3 +1870,12 @@ panel_ditem_register_save_uri_func (Pane
dialog->priv->save_uri = save_uri;
dialog->priv->save_uri_data = data;
}
@@ -278,3 +266,15 @@ diff -up gnome-panel-2.21.91/gnome-panel
+ return dialog->priv->orig_desktop_file;
+}
+
+diff -up gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.h
+--- gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring 2009-04-19 13:45:09.000000000 -0400
++++ gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.h 2010-01-17 18:06:14.638537025 -0500
+@@ -101,6 +101,8 @@ void panel_ditem_editor_set_uri (PanelDI
+ const char *uri);
+
+ G_CONST_RETURN char *panel_ditem_editor_get_uri (PanelDItemEditor *dialog);
++G_CONST_RETURN char *panel_ditem_editor_get_orig_desktop_file (PanelDItemEditor *dialog);
++
+
+ void panel_ditem_register_save_uri_func (PanelDItemEditor *dialog,
+ PanelDitemSaveUri save_uri,
Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -p -r1.372 -r1.373
--- gnome-panel.spec 16 Dec 2009 04:13:51 -0000 1.372
+++ gnome-panel.spec 17 Jan 2010 23:40:43 -0000 1.373
@@ -21,10 +21,10 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.28.0
-Release: 17%{?dist}
+Version: 2.29.5.1
+Release: 1%{?dist}
URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-panel/2.28/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-panel/2.29/%{name}-%{version}.tar.bz2
Source3: redhat-panel-default-setup.entries
Source4: gnome-compiler-flags.m4
@@ -107,17 +107,12 @@ Patch11: applet-error.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=520111
Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
-Patch35: clock-wakeups.patch
-
# http://bugzilla.gnome.org/show_bug.cgi?id=579092
Patch38: clock-network.patch
Patch40: clock-home.patch
Patch41: bookmarks-submenu.patch
-# from upstream
-Patch42: panel-randr-crashes.patch
-
# http://bugzilla.gnome.org/show_bug.cgi?id=343436
Patch43: panel-padding.patch
@@ -133,9 +128,6 @@ Patch46: resolution-change.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=537798
Patch47: fix-clock-crash.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=604678
-Patch48: polkit-error.patch
-
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -179,17 +171,14 @@ Panel Applets using the libpanel-applet
%patch10 -p1 -b .preferred-apps
%patch11 -p1 -b .applet-error
%patch24 -p1 -b .allow-spurious-view-done-signals
-%patch35 -p1 -b .clock-wakeups
%patch38 -p1 -b .clock-network
%patch40 -p1 -b .clock-home
%patch41 -p1 -b .bookmarks-submenu
-%patch42 -p1 -b .randr-crashes
%patch43 -p1 -b .panel-padding
%patch44 -p1 -b .icon-order
%patch45 -p1 -b .icon-padding
%patch46 -p1 -b .resolution-change
%patch47 -p1 -b .fix-clock-crash
-%patch48 -p1 -b .polkit-error
. %{SOURCE6}
@@ -397,6 +386,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Sun Jan 17 2010 Matthias Clasen <mclasen at redhat.com> 2.29.5.1-1
+- Update to 2.29.5.1
+
* Tue Dec 15 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-17
- Handle errors returned from PolicyKit in the clock applet (#547624)
- Fix clock crash (bug 537798)
launcher-desktop-files.patch:
panel-ditem-editor.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 53 insertions(+), 3 deletions(-)
Index: launcher-desktop-files.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/launcher-desktop-files.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- launcher-desktop-files.patch 18 Jun 2008 21:31:13 -0000 1.3
+++ launcher-desktop-files.patch 17 Jan 2010 23:40:43 -0000 1.4
@@ -1,59 +1,59 @@
-diff -up gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c.launcher-desktop-files gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c
---- gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c.launcher-desktop-files 2007-09-04 13:34:26.000000000 -0400
-+++ gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c 2007-09-13 12:13:36.000000000 -0400
-@@ -973,6 +973,51 @@ panel_ditem_editor_icon_changed (PanelDI
- g_free (file);
+diff -up gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c.launcher-desktop-files gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c
+--- gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c.launcher-desktop-files 2010-01-13 22:26:27.000000000 -0500
++++ gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c 2010-01-17 18:05:34.492279538 -0500
+@@ -960,6 +960,51 @@ panel_ditem_editor_icon_changed (PanelDI
+ icon);
}
+static gboolean
+update_editor_from_desktop_file (PanelDItemEditor *dialog,
-+ const gchar *uri)
++ const gchar *uri)
+{
-+ GKeyFile *key_file;
-+ char *name;
-+ char *comment;
-+ char *exec;
-+ char *icon;
-+ gboolean retval = FALSE;
-+
-+ key_file = g_key_file_new ();
-+ if (g_key_file_load_from_file (key_file, uri, 0, NULL)) {
-+ if (panel_key_file_get_boolean (key_file, "Terminal", FALSE))
-+ gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->priv->type_combo), 1);
-+ else
-+ gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->priv->type_combo), 0);
-+
-+ name = panel_key_file_get_locale_string (key_file, "Name");
-+ comment = panel_key_file_get_locale_string (key_file, "Comment");
-+ icon = panel_key_file_get_locale_string (key_file, "Icon");
-+ exec = panel_key_file_get_string (key_file, "Exec");
-+
-+ gtk_entry_set_text (GTK_ENTRY (dialog->priv->name_entry), name ? name : "");
-+ gtk_entry_set_text (GTK_ENTRY (dialog->priv->comment_entry), comment ? comment : "");
-+ gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry), exec ? exec : "");
-+
-+ /* Note: we need to set the icon last, since the editor
-+ * tries to guess the icon when the command is modified
-+ */
-+ setup_icon_entry (dialog, icon);
-+
-+ g_free (name);
-+ g_free (comment);
-+ g_free (icon);
-+ g_free (exec);
++ GKeyFile *key_file;
++ char *name;
++ char *comment;
++ char *exec;
++ char *icon;
++ gboolean retval = FALSE;
++
++ key_file = g_key_file_new ();
++ if (g_key_file_load_from_file (key_file, uri, 0, NULL)) {
++ if (panel_key_file_get_boolean (key_file, "Terminal", FALSE))
++ gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->priv->type_combo), 1);
++ else
++ gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->priv->type_combo), 0);
++
++ name = panel_key_file_get_locale_string (key_file, "Name");
++ comment = panel_key_file_get_locale_string (key_file, "Comment");
++ icon = panel_key_file_get_locale_string (key_file, "Icon");
++ exec = panel_key_file_get_string (key_file, "Exec");
++
++ gtk_entry_set_text (GTK_ENTRY (dialog->priv->name_entry), name ? name : "");
++ gtk_entry_set_text (GTK_ENTRY (dialog->priv->comment_entry), comment ? comment : "");
++ gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry), exec ? exec : "");
++
++ /* Note: we need to set the icon last, since the editor
++ * tries to guess the icon when the command is modified
++ */
++ setup_icon_entry (dialog, icon);
++
++ g_free (name);
++ g_free (comment);
++ g_free (icon);
++ g_free (exec);
+
-+ retval = TRUE;
-+ }
++ retval = TRUE;
++ }
+
-+ g_key_file_free (key_file);
++ g_key_file_free (key_file);
+
-+ return retval;
++ return retval;
+}
+
static void
command_browse_chooser_response (GtkFileChooser *chooser,
gint response_id,
-@@ -986,7 +1031,11 @@ command_browse_chooser_response (GtkFile
+@@ -973,7 +1018,11 @@ command_browse_chooser_response (GtkFile
case PANEL_DITEM_EDITOR_TYPE_APPLICATION:
case PANEL_DITEM_EDITOR_TYPE_TERMINAL_APPLICATION:
text = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
@@ -66,7 +66,7 @@ diff -up gnome-panel-2.19.92/gnome-panel
g_free (text);
break;
case PANEL_DITEM_EDITOR_TYPE_LINK:
-@@ -996,8 +1045,9 @@ command_browse_chooser_response (GtkFile
+@@ -983,8 +1032,9 @@ command_browse_chooser_response (GtkFile
g_assert_not_reached ();
}
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/sources,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- sources 24 Sep 2009 00:34:45 -0000 1.102
+++ sources 17 Jan 2010 23:40:43 -0000 1.103
@@ -1 +1 @@
-9f0ea283d44bbcce67dc2e8a02fe9fad gnome-panel-2.28.0.tar.bz2
+4e86f12049645566778fa2796649ff9e gnome-panel-2.29.5.1.tar.bz2
More information about the scm-commits
mailing list