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

Lionel Le Folgoc mrpouit-guest at alioth.debian.org
Wed Feb 2 08:59:08 UTC 2011


Author: mrpouit-guest
Date: 2011-02-02 20:59:08 +0000 (Wed, 02 Feb 2011)
New Revision: 4872

Removed:
   goodies/branches/experimental/xfce4-notifyd/debian/patches/01_fix-loading-icon-with-paths.patch
   goodies/branches/experimental/xfce4-notifyd/debian/patches/02_fix-crash-on-first-launch.patch
   goodies/branches/experimental/xfce4-notifyd/debian/patches/series
Modified:
   goodies/branches/experimental/xfce4-notifyd/debian/changelog
   goodies/branches/experimental/xfce4-notifyd/debian/rules
Log:
New upstream release, drop patches

Modified: goodies/branches/experimental/xfce4-notifyd/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-notifyd/debian/changelog	2011-01-30 22:58:27 UTC (rev 4871)
+++ goodies/branches/experimental/xfce4-notifyd/debian/changelog	2011-02-02 20:59:08 UTC (rev 4872)
@@ -1,6 +1,5 @@
-xfce4-notifyd (0.2.0-1) UNRELEASED; urgency=low
+xfce4-notifyd (0.2.1-1) UNRELEASED; urgency=low
 
-  [ Yves-Alexis Perez ]
   * New upstream release.
   * debian/control:
     - convert libxfcegui4-dev build-dep to libxfce4ui-dev.
@@ -17,7 +16,6 @@
       ported to libnotify 0.4.5.
     - 02_add-spec-version-to-GetServerInformation dropped as well, included
       upstream.
-    - 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

Deleted: goodies/branches/experimental/xfce4-notifyd/debian/patches/01_fix-loading-icon-with-paths.patch
===================================================================
--- goodies/branches/experimental/xfce4-notifyd/debian/patches/01_fix-loading-icon-with-paths.patch	2011-01-30 22:58:27 UTC (rev 4871)
+++ goodies/branches/experimental/xfce4-notifyd/debian/patches/01_fix-loading-icon-with-paths.patch	2011-02-02 20:59:08 UTC (rev 4872)
@@ -1,30 +0,0 @@
-Description: fix icon loading when given full path
-Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6895
-Author: Yves-Alexis Perez <corsac at debian.org>
-Applied-Upstream: 0.1.3, http://git.xfce.org/apps/xfce4-notifyd/commit/?id=2529fb74ca78c52e8c66620e10ad275373d988bb
-diff --git a/xfce4-notifyd/xfce-notify-window.c b/xfce4-notifyd/xfce-notify-window.c
-index d10ef1c..a7c7289 100644
---- a/xfce4-notifyd/xfce-notify-window.c
-+++ b/xfce4-notifyd/xfce-notify-window.c
-@@ -1041,7 +1041,11 @@ xfce_notify_window_set_icon_name(XfceNotifyWindow *window,
-         GdkPixbuf *pix;
- 
-         gtk_icon_size_lookup(GTK_ICON_SIZE_DIALOG, &w, &h);
--        pix = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
-+
-+        if(g_path_is_absolute(icon_name))
-+          pix = gdk_pixbuf_new_from_file_at_size(icon_name, w, h, NULL);
-+        else
-+          pix = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
-                                        icon_name,
-                                        w,
-                                        GTK_ICON_LOOKUP_FORCE_SIZE,
-@@ -1056,7 +1060,7 @@ xfce_notify_window_set_icon_name(XfceNotifyWindow *window,
-     }
- 
-     if(!icon_set) {
--        gtk_image_set_from_pixbuf(GTK_IMAGE(window->icon), NULL);
-+        gtk_image_clear(GTK_IMAGE(window->icon));
-         gtk_widget_hide(window->icon_box);
-     }
- 

Deleted: 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	2011-01-30 22:58:27 UTC (rev 4871)
+++ goodies/branches/experimental/xfce4-notifyd/debian/patches/02_fix-crash-on-first-launch.patch	2011-02-02 20:59:08 UTC (rev 4872)
@@ -1,56 +0,0 @@
-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

Deleted: goodies/branches/experimental/xfce4-notifyd/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-notifyd/debian/patches/series	2011-01-30 22:58:27 UTC (rev 4871)
+++ goodies/branches/experimental/xfce4-notifyd/debian/patches/series	2011-02-02 20:59:08 UTC (rev 4872)
@@ -1,2 +0,0 @@
-01_fix-loading-icon-with-paths.patch
-02_fix-crash-on-first-launch.patch

Modified: goodies/branches/experimental/xfce4-notifyd/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-notifyd/debian/rules	2011-01-30 22:58:27 UTC (rev 4871)
+++ goodies/branches/experimental/xfce4-notifyd/debian/rules	2011-02-02 20:59:08 UTC (rev 4872)
@@ -9,13 +9,5 @@
 
 export CFLAGS LDFLAGS
 
-override_dh_auto_configure:
-	dh_auto_configure
-	find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;
-
-override_dh_auto_clean:
-	rm -f po/POTFILES.skip
-	dh_auto_clean
-
 %:
 	dh $@




More information about the Pkg-xfce-commits mailing list