diff options
| author | Matthias Clasen <mclasen@fedoraproject.org> | 2008-02-14 02:13:40 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@fedoraproject.org> | 2008-02-14 02:13:40 +0000 |
| commit | 88014b2ec59cfb19a6dd2aa385bb7df359fadf9b (patch) | |
| tree | fd53ef0440be02bb1260e1af921de0ae72bd1311 /applet-error.patch | |
| parent | f5b219ea94709bb17b0afb83f93d331cd9b91cbf (diff) | |
| download | gnome-panel-88014b2ec59cfb19a6dd2aa385bb7df359fadf9b.tar.gz gnome-panel-88014b2ec59cfb19a6dd2aa385bb7df359fadf9b.tar.xz gnome-panel-88014b2ec59cfb19a6dd2aa385bb7df359fadf9b.zip | |
2.21.91gnome-panel-2_21_91-1_fc9
Diffstat (limited to 'applet-error.patch')
| -rw-r--r-- | applet-error.patch | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/applet-error.patch b/applet-error.patch index 26a8d35..d4ed3ec 100644 --- a/applet-error.patch +++ b/applet-error.patch @@ -1,7 +1,7 @@ -diff -up gnome-panel-2.20.0.1/gnome-panel/panel-applet-frame.c.applet-error gnome-panel-2.20.0.1/gnome-panel/panel-applet-frame.c ---- gnome-panel-2.20.0.1/gnome-panel/panel-applet-frame.c.applet-error 2007-09-21 16:24:28.000000000 -0400 -+++ gnome-panel-2.20.0.1/gnome-panel/panel-applet-frame.c 2007-09-21 16:24:32.000000000 -0400 -@@ -1253,6 +1253,21 @@ panel_applet_frame_event_listener (Bonob +diff -up gnome-panel-2.21.91/gnome-panel/panel-applet-frame.c.applet-error gnome-panel-2.21.91/gnome-panel/panel-applet-frame.c +--- gnome-panel-2.21.91/gnome-panel/panel-applet-frame.c.applet-error 2008-02-11 16:15:47.000000000 -0500 ++++ gnome-panel-2.21.91/gnome-panel/panel-applet-frame.c 2008-02-13 20:35:59.000000000 -0500 +@@ -1242,6 +1242,21 @@ panel_applet_frame_event_listener (Bonob panel_applet_frame_set_size_hints_from_any (frame, any); } @@ -21,18 +21,16 @@ diff -up gnome-panel-2.20.0.1/gnome-panel/panel-applet-frame.c.applet-error gnom +} + static void - panel_applet_frame_activated (Bonobo_Unknown object, - CORBA_Environment *ev, -@@ -1275,8 +1290,10 @@ panel_applet_frame_activated (Bonobo_Unk - if (BONOBO_EX (ev) || object == CORBA_OBJECT_NIL) { - error = bonobo_exception_get_text (ev); + panel_applet_frame_activated (CORBA_Object object, + const char *error_reason, +@@ -1266,7 +1281,9 @@ panel_applet_frame_activated (CORBA_Obje + if (error_reason != NULL || object == CORBA_OBJECT_NIL) { g_warning (G_STRLOC ": failed to load applet %s:\n%s", -- frame->priv->iid, error); + frame->priv->iid, error_reason); - panel_applet_frame_loading_failed (frame, frame_act->id); -+ frame->priv->iid, error); + if (!in_default_panel_config (frame_act->id)) { + panel_applet_frame_loading_failed (frame, frame_act->id); + } g_free (frame_act->id); g_free (frame_act); - g_free (error); + return; |