Hello community,
here is the log from the commit of package xfce4-panel for openSUSE:Factory
checked in at Wed Sep 21 17:27:07 CEST 2011.
--------
--- xfce4-panel/xfce4-panel.changes 2011-07-10 18:13:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/xfce4-panel/xfce4-panel.changes
2011-09-20 15:59:45.000000000 +0200
@@ -1,0 +2,12 @@
+Tue Sep 20 13:44:53 UTC 2011 - g...@opensuse.org
+
+- renamed xfce4-panel-4.8.-wait-until-wm-is-ready.patch to
+ xfce4-panel-4.8.5-wait-until-wm-is-ready.patch
+- added xfce4-panel-4.8.5-handle-panel-not-yet-realized.patch
+ in order to handle the case when the panel is not yet realized
+ (backported from upstream git)
+- added xfce4-panel-4.8.5-fix-crash-on-non-existing-menu.patch in
+ order to fix a segfault with not-existing menus (backported from
+ upstream git)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xfce4-panel-4.8.-wait-until-wm-is-ready.patch
New:
----
xfce4-panel-4.8.5-fix-crash-on-non-existing-menu.patch
xfce4-panel-4.8.5-handle-panel-not-yet-realized.patch
xfce4-panel-4.8.5-wait-until-wm-is-ready.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfce4-panel.spec ++++++
--- /var/tmp/diff_new_pack.h7I0bO/_old 2011-09-21 17:26:52.000000000 +0200
+++ /var/tmp/diff_new_pack.h7I0bO/_new 2011-09-21 17:26:52.000000000 +0200
@@ -26,8 +26,12 @@
Group: System/GUI/XFCE
Source: %{name}-%{version}.tar.bz2
Source1: %{name}-rpmlintrc
-# PATCH-FIX-UPSTREAM xfce4-panel-4.8.-wait-until-wm-is-ready.patch bxo#7161
g...@opensuse.org -- Wait until the wm is ready on all screens in order to
ensure that the panel ends up on the correct screen in multipanel setups
(backported from upstream git)
-Patch0: xfce4-panel-4.8.-wait-until-wm-is-ready.patch
+# PATCH-FIX-UPSTREAM xfce4-panel-4.8.5-wait-until-wm-is-ready.patch bxo#7161
g...@opensuse.org -- Wait until the wm is ready on all screens in order to
ensure that the panel ends up on the correct screen in multipanel setups
(backported from upstream git)
+Patch0: xfce4-panel-4.8.5-wait-until-wm-is-ready.patch
+# PATCH-FIX-UPSTREAM xfce4-panel-4.8.5-handle-panel-not-yet-realized.patch
g...@opensuse.org -- Handle the case when the panel is not yet realized
(backported from upstream git)
+Patch1: xfce4-panel-4.8.5-handle-panel-not-yet-realized.patch
+# PATCH-FIX-UPSTREAM xfce4-panel-4.8.5-fix-crash-on-non-existing-menu.patch
bxo#7895 g...@opensuse.org -- Fix segfault with a not-existing menu (backported
from upstream git)
+Patch2: xfce4-panel-4.8.5-fix-crash-on-non-existing-menu.patch
BuildRequires: gtk-doc
BuildRequires: intltool
BuildRequires: perl-XML-Parser
@@ -98,6 +102,8 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
%configure \
++++++ xfce4-panel-4.8.5-fix-crash-on-non-existing-menu.patch ++++++
diff --git a/plugins/applicationsmenu/applicationsmenu.c
b/plugins/applicationsmenu/applicationsmenu.c
index df0bb5c..bf99281 100644
--- a/plugins/applicationsmenu/applicationsmenu.c
+++ b/plugins/applicationsmenu/applicationsmenu.c
@@ -1031,10 +1031,11 @@ applications_menu_plugin_menu (GtkWidget
*button,
else
{
xfce_dialog_show_error (NULL, error, _("Failed to load the
applications menu"));
- g_error_free (error);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), FALSE);
+ if (G_LIKELY (error != NULL))
+ g_error_free (error);
if (G_LIKELY (menu != NULL))
g_object_unref (G_OBJECT (menu));
++++++ xfce4-panel-4.8.5-handle-panel-not-yet-realized.patch ++++++
diff --git a/libxfce4panel/xfce-panel-plugin.c
b/libxfce4panel/xfce-panel-plugin.c
index c85e1ab..57586f0 100644
--- a/libxfce4panel/xfce-panel-plugin.c
+++ b/libxfce4panel/xfce-panel-plugin.c
@@ -1989,6 +1989,7 @@ xfce_panel_plugin_arrow_type (XfcePanelPlugin *plugin)
gint monitor_num;
GdkRectangle monitor;
gint x, y;
+ GdkWindow *window;
g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), GTK_ARROW_NONE);
g_return_val_if_fail (XFCE_PANEL_PLUGIN_CONSTRUCTED (plugin),
GTK_ARROW_NONE);
@@ -2007,13 +2008,17 @@ xfce_panel_plugin_arrow_type (XfcePanelPlugin *plugin)
return GTK_ARROW_LEFT;
else /* floating */
{
+ window = gtk_widget_get_window (GTK_WIDGET (plugin));
+ if (G_UNLIKELY (window == NULL))
+ return GTK_ARROW_NONE;
+
/* get the monitor geometry */
screen = gtk_widget_get_screen (GTK_WIDGET (plugin));
- monitor_num = gdk_screen_get_monitor_at_window (screen, GTK_WIDGET
(plugin)->window);
+ monitor_num = gdk_screen_get_monitor_at_window (screen, window);
gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
/* get the plugin root origin */
- gdk_window_get_root_origin (GTK_WIDGET (plugin)->window, &x, &y);
+ gdk_window_get_root_origin (window, &x, &y);
/* detect arrow type */
if (screen_position == XFCE_SCREEN_POSITION_FLOATING_H)
++++++ xfce4-panel-4.8.-wait-until-wm-is-ready.patch ->
xfce4-panel-4.8.5-wait-until-wm-is-ready.patch ++++++
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
