diff options
author | Ray Strode <rstrode@fedoraproject.org> | 2008-11-04 02:16:24 +0000 |
---|---|---|
committer | Ray Strode <rstrode@fedoraproject.org> | 2008-11-04 02:16:24 +0000 |
commit | 952d4eeabcf225e3f773f96a27e515d2a2232ab1 (patch) | |
tree | 6f3a3853b98d9a02c298d07df6878292e9cde12e | |
parent | 537397c929e01e7b0f23bc44db7248c5445b4ee6 (diff) | |
download | gnome-panel-952d4eeabcf225e3f773f96a27e515d2a2232ab1.tar.gz gnome-panel-952d4eeabcf225e3f773f96a27e515d2a2232ab1.tar.xz gnome-panel-952d4eeabcf225e3f773f96a27e515d2a2232ab1.zip |
- Fix up panel slide in patch to work better with empty panelsgnome-panel-2_24_1-3_fc10F-10-startF-10-split
-rw-r--r-- | gnome-panel-2.24.1-smoother-slide-in.patch | 76 | ||||
-rw-r--r-- | gnome-panel.spec | 5 |
2 files changed, 52 insertions, 29 deletions
diff --git a/gnome-panel-2.24.1-smoother-slide-in.patch b/gnome-panel-2.24.1-smoother-slide-in.patch index 9b2c152..08875d1 100644 --- a/gnome-panel-2.24.1-smoother-slide-in.patch +++ b/gnome-panel-2.24.1-smoother-slide-in.patch @@ -1,11 +1,11 @@ -commit 37414a0c6ee5e655b72742b3279f363990c444ae +commit 2d6b5f237b167989b96302b8447333dc94e082f6 Author: Ray Strode <rstrode@redhat.com> Date: Mon Nov 3 17:19:13 2008 -0500 Don't slide panel down until applets load diff --git a/gnome-panel/applet.c b/gnome-panel/applet.c -index 165ded5..6c880a4 100644 +index 165ded5..53be8e4 100644 --- a/gnome-panel/applet.c +++ b/gnome-panel/applet.c @@ -792,6 +792,7 @@ typedef struct { @@ -16,10 +16,29 @@ index 165ded5..6c880a4 100644 static gboolean panel_applet_have_load_idle = FALSE; static void -@@ -818,6 +819,44 @@ panel_applet_on_load_queue (const char *id) - return FALSE; +@@ -819,6 +820,52 @@ panel_applet_on_load_queue (const char *id) } + static gboolean ++initially_unhide_toplevels (void) ++{ ++ GSList *toplevels, *l; ++ ++ toplevels = panel_toplevel_list_toplevels (); ++ ++ l = toplevels; ++ while (l != NULL) { ++ PanelToplevel *toplevel; ++ ++ toplevel = (PanelToplevel *) l->data; ++ ++ panel_toplevel_queue_initial_unhide (toplevel); ++ l = l->next; ++ } ++ ++ return FALSE; ++} ++ +void +panel_applet_stop_loading (const char *id) +{ @@ -42,26 +61,15 @@ index 165ded5..6c880a4 100644 + free_applet_to_load (applet); + + if (panel_applets_loading == NULL) { -+ GSList *toplevels, *l; -+ -+ toplevels = panel_toplevel_list_toplevels (); -+ -+ l = toplevels; -+ while (l != NULL) { -+ PanelToplevel *toplevel; -+ -+ toplevel = (PanelToplevel *) l->data; -+ -+ panel_toplevel_queue_initial_unhide (toplevel); -+ l = l->next; -+ } ++ initially_unhide_toplevels (); + } +} + - static gboolean ++static gboolean panel_applet_load_idle_handler (gpointer dummy) { -@@ -848,8 +887,8 @@ panel_applet_load_idle_handler (gpointer dummy) + PanelAppletToLoad *applet = NULL; +@@ -848,8 +895,8 @@ panel_applet_load_idle_handler (gpointer dummy) panel_applet_have_load_idle = FALSE; return FALSE; } @@ -71,7 +79,7 @@ index 165ded5..6c880a4 100644 panel_widget = panel_toplevel_get_panel_widget (toplevel); -@@ -873,6 +912,7 @@ panel_applet_load_idle_handler (gpointer dummy) +@@ -873,6 +920,7 @@ panel_applet_load_idle_handler (gpointer dummy) applet->locked, applet->position, applet->id); @@ -79,7 +87,7 @@ index 165ded5..6c880a4 100644 break; case PANEL_OBJECT_MENU: panel_menu_button_load_from_gconf (panel_widget, -@@ -880,12 +920,14 @@ panel_applet_load_idle_handler (gpointer dummy) +@@ -880,12 +928,14 @@ panel_applet_load_idle_handler (gpointer dummy) applet->position, TRUE, applet->id); @@ -94,7 +102,7 @@ index 165ded5..6c880a4 100644 break; case PANEL_OBJECT_LOGOUT: case PANEL_OBJECT_LOCK: -@@ -896,6 +938,7 @@ panel_applet_load_idle_handler (gpointer dummy) +@@ -896,6 +946,7 @@ panel_applet_load_idle_handler (gpointer dummy) applet->position, TRUE, applet->id); @@ -102,7 +110,7 @@ index 165ded5..6c880a4 100644 break; case PANEL_OBJECT_ACTION: panel_action_button_load_from_gconf ( -@@ -904,6 +947,7 @@ panel_applet_load_idle_handler (gpointer dummy) +@@ -904,6 +955,7 @@ panel_applet_load_idle_handler (gpointer dummy) applet->position, TRUE, applet->id); @@ -110,7 +118,7 @@ index 165ded5..6c880a4 100644 break; case PANEL_OBJECT_MENU_BAR: panel_menu_bar_load_from_gconf ( -@@ -912,18 +956,18 @@ panel_applet_load_idle_handler (gpointer dummy) +@@ -912,18 +964,18 @@ panel_applet_load_idle_handler (gpointer dummy) applet->position, TRUE, applet->id); @@ -131,6 +139,18 @@ index 165ded5..6c880a4 100644 return TRUE; } +@@ -971,8 +1023,10 @@ panel_applet_compare (const PanelAppletToLoad *a, + void + panel_applet_load_queued_applets (void) + { +- if (!panel_applets_to_load) ++ if (!panel_applets_to_load) { ++ g_idle_add (initially_unhide_toplevels, NULL); + return; ++ } + + panel_applets_to_load = g_slist_sort (panel_applets_to_load, + (GCompareFunc) panel_applet_compare); diff --git a/gnome-panel/applet.h b/gnome-panel/applet.h index 8790229..16cfa46 100644 --- a/gnome-panel/applet.h @@ -262,7 +282,7 @@ index 81e6c76..60400ea 100644 void panel_toplevel_pop_autohide_disabler (PanelToplevel *toplevel); -commit e0ab832dcf9a2bf7889abef798b56b67bcb2b167 +commit 2c3e3ad9f93a2b17e2a251913e48d154d15ef93e Author: Ray Strode <rstrode@redhat.com> Date: Mon Nov 3 11:50:16 2008 -0500 @@ -331,7 +351,7 @@ index 37fc5f0..0962659 100644 cur_y -= panel_multiscreen_y (screen, toplevel->priv->monitor); -commit 7c9b2b501b3b3c83dc030de70f6d13e76c0c328e +commit 36b97aa7bb302b65f554c370d7e8c58af4386a76 Author: Ray Strode <rstrode@redhat.com> Date: Mon Nov 3 17:20:09 2008 -0500 @@ -563,7 +583,7 @@ index 0962659..bef6a02 100644 g_object_notify (G_OBJECT (toplevel), "auto-hide"); -commit c78ee2be16ffe3a2f158bc880be246f06623d60c +commit 2184c0fc4aa8fea0ffebe1192164125e24107178 Author: Ray Strode <rstrode@redhat.com> Date: Mon Nov 3 17:12:04 2008 -0500 @@ -582,7 +602,7 @@ index bef6a02..96f564c 100644 } -commit 9d711261374f2fc55664c1707f5cf283c594be8a +commit 835cea12efb407b2c9181d33e442317cc1a16904 Author: Ray Strode <rstrode@redhat.com> Date: Mon Nov 3 17:13:32 2008 -0500 diff --git a/gnome-panel.spec b/gnome-panel.spec index 6e0ebe5..14f32d4 100644 --- a/gnome-panel.spec +++ b/gnome-panel.spec @@ -23,7 +23,7 @@ Summary: GNOME panel Name: gnome-panel Version: 2.24.1 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-panel/2.24/%{name}-%{version}.tar.bz2 @@ -371,6 +371,9 @@ fi %{_datadir}/gtk-doc/html/* %changelog +* Mon Nov 3 2008 Ray Strode <rstrode@redhat.com> - 2.24.1-3 +- Fix up panel slide in patch to work better with empty panels + * Mon Nov 3 2008 Ray Strode <rstrode@redhat.com> - 2.24.1-2 - Fix up panel slide in patch to 1) not have odd effects with vertical panels |