[Pkg-xfce-commits] r4659 - in goodies/branches/experimental/xfce4-notifyd/debian: . patches

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2010-12-09 12:38:49 +0000 (Thu, 09 Dec 2010)
New Revision: 4659

Added:
   goodies/branches/experimental/xfce4-notifyd/debian/patches/02_fix-crash-on-first-launch.patch
Modified:
   goodies/branches/experimental/xfce4-notifyd/debian/changelog
   goodies/branches/experimental/xfce4-notifyd/debian/patches/series
Log:
01_fix-loading-icon-with-paths,02_fix-crash-on-first-launch.patch: added.

Modified: goodies/branches/experimental/xfce4-notifyd/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-notifyd/debian/changelog	2010-12-09 12:35:44 UTC (rev 4658)
+++ goodies/branches/experimental/xfce4-notifyd/debian/changelog	2010-12-09 12:38:49 UTC (rev 4659)
@@ -1,5 +1,6 @@
 xfce4-notifyd (0.2.0-1) UNRELEASED; urgency=low
 
+  [ Yves-Alexis Perez ]
   * New upstream release.
   * debian/control:
     - convert libxfcegui4-dev build-dep to libxfce4ui-dev.
@@ -16,7 +17,7 @@
       ported to libnotify 0.4.5.
     - 02_add-spec-version-to-GetServerInformation dropped as well, included
       upstream.
-    - 01_fix-loading-icon-with-paths added.
+    - 01_fix-loading-icon-with-paths,02_fix-crash-on-first-launch.patch: added.
   * debian/copyright updated for new release.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Mon, 29 Nov 2010 21:00:58 +0100

Added: goodies/branches/experimental/xfce4-notifyd/debian/patches/02_fix-crash-on-first-launch.patch
===================================================================
--- goodies/branches/experimental/xfce4-notifyd/debian/patches/02_fix-crash-on-first-launch.patch	                        (rev 0)
+++ goodies/branches/experimental/xfce4-notifyd/debian/patches/02_fix-crash-on-first-launch.patch	2010-12-09 12:38:49 UTC (rev 4659)
@@ -0,0 +1,56 @@
+From c7b151d2b9023085a4a28305c06d10406bb49120 Mon Sep 17 00:00:00 2001
+From: Jérôme Guelfucci <jeromeg at xfce.org>
+Date: Thu, 09 Dec 2010 12:20:24 +0000
+Subject: Don't update the placement data if it was never initialized.
+
+---
+diff --git a/xfce4-notifyd/xfce-notify-daemon.c b/xfce4-notifyd/xfce-notify-daemon.c
+index c54358b..710995b 100644
+--- a/xfce4-notifyd/xfce-notify-daemon.c
++++ b/xfce4-notifyd/xfce-notify-daemon.c
+@@ -213,7 +213,8 @@ xfce_notify_rootwin_watch_workarea(GdkXEvent *gxevent,
+     XPropertyEvent *xevt = (XPropertyEvent *)gxevent;
+ 
+     if(xevt->type == PropertyNotify
+-       && XInternAtom(xevt->display, "_NET_WORKAREA", False) == xevt->atom)
++       && XInternAtom(xevt->display, "_NET_WORKAREA", False) == xevt->atom
++       && xndaemon->monitors_workarea)
+     {
+         GdkScreen *screen = gdk_event_get_screen(event);
+         int screen_number = gdk_screen_get_number (screen);
+@@ -236,12 +237,20 @@ xfce_notify_daemon_screen_changed(GdkScreen *screen,
+ {
+     XfceNotifyDaemon *xndaemon = XFCE_NOTIFY_DAEMON(user_data);
+     gint j;
+-    gint new_nmonitor = gdk_screen_get_n_monitors(screen);
+-    gint screen_number = gdk_screen_get_number(screen);
+-    gint old_nmonitor = GPOINTER_TO_INT(g_object_get_qdata(G_OBJECT(screen), XND_N_MONITORS));
++    gint new_nmonitor;
++    gint screen_number;
++    gint old_nmonitor;
++
++    if(!xndaemon->monitors_workarea || !xndaemon->reserved_rectangles)
++        /* Placement data not initialized, don't update it */
++        return;
+ 
+     DBG("Got 'screen-changed' signal for screen %d", screen_number);
+ 
++    new_nmonitor = gdk_screen_get_n_monitors(screen);
++    screen_number = gdk_screen_get_number(screen);
++    old_nmonitor = GPOINTER_TO_INT(g_object_get_qdata(G_OBJECT(screen), XND_N_MONITORS));
++
+     /* Set the new number of monitors */
+     g_object_set_qdata(G_OBJECT(screen), XND_N_MONITORS, GINT_TO_POINTER(new_nmonitor));
+ 
+@@ -312,6 +321,9 @@ xfce_notify_daemon_init(XfceNotifyDaemon *xndaemon)
+                                                    (GDestroyNotify)gtk_widget_destroy);
+     xndaemon->last_notification_id = 1;
+ 
++    xndaemon->reserved_rectangles = NULL;
++    xndaemon->monitors_workarea = NULL;
++
+     xndaemon->close_timeout =
+         g_timeout_add_seconds(600, (GSourceFunc) xfce_notify_daemon_close_timeout,
+                               xndaemon);
+--
+cgit v0.8.3.4

Modified: goodies/branches/experimental/xfce4-notifyd/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-notifyd/debian/patches/series	2010-12-09 12:35:44 UTC (rev 4658)
+++ goodies/branches/experimental/xfce4-notifyd/debian/patches/series	2010-12-09 12:38:49 UTC (rev 4659)
@@ -1 +1,2 @@
 01_fix-loading-icon-with-paths.patch
+02_fix-crash-on-first-launch.patch