diff options
| author | Matthias Clasen <mclasen@fedoraproject.org> | 2009-01-20 19:37:52 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@fedoraproject.org> | 2009-01-20 19:37:52 +0000 |
| commit | 274955884aba242ad2f65d877cffc7a50a824f62 (patch) | |
| tree | c73469354681e96d54039420fd6943d8f27e799f /applet-error.patch | |
| parent | 2572bf1cb84eb63f6b1b77865c0ed33ba7269f7b (diff) | |
| download | gnome-panel-274955884aba242ad2f65d877cffc7a50a824f62.tar.gz gnome-panel-274955884aba242ad2f65d877cffc7a50a824f62.tar.xz gnome-panel-274955884aba242ad2f65d877cffc7a50a824f62.zip | |
drop lost of patchesgnome-panel-2_25_5-1_fc11
Diffstat (limited to 'applet-error.patch')
| -rw-r--r-- | applet-error.patch | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/applet-error.patch b/applet-error.patch index d4ed3ec..9a3228a 100644 --- a/applet-error.patch +++ b/applet-error.patch @@ -1,7 +1,7 @@ -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 +diff -up gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c.applet-error gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c +--- gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c.applet-error 2009-01-20 09:04:47.000000000 -0500 ++++ gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c 2009-01-20 14:22:33.000000000 -0500 +@@ -1246,6 +1246,21 @@ panel_applet_frame_event_listener (Bonob panel_applet_frame_set_size_hints_from_any (frame, any); } @@ -23,14 +23,14 @@ diff -up gnome-panel-2.21.91/gnome-panel/panel-applet-frame.c.applet-error gnome static void 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_reason); -- panel_applet_frame_loading_failed (frame, frame_act->id); -+ 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); - return; +@@ -1425,7 +1440,9 @@ panel_applet_frame_activated (CORBA_Obje + return; + + error_out: +- panel_applet_frame_loading_failed (frame, frame_act->id); ++ if (!in_default_panel_config (frame_act->id)) { ++ panel_applet_frame_loading_failed (frame, frame_act->id); ++ } + if (widget) + g_object_unref (widget); + panel_applet_stop_loading (frame_act->id); |