up to 1.5.2

diff --git a/mate-notification-daemon.spec b/mate-notification-daemon.spec
index f82360ea79f5f8d09433da05cc41de4e79f500f4..c2c8d72180566c7339935bfe8b702c75bf2e56b0 100644 (file)
--- a/mate-notification-daemon.spec
+++ b/mate-notification-daemon.spec
@@ -3,13 +3,12 @@
 #   http://git.gnome.org/browse/notification-daemon/commit/data?id=1ad20d22098bc7718614a8a87744a2c22d5438d0
 Summary:       Notification daemon for MATE Desktop
 Name:          mate-notification-daemon
-Version:       1.5.1
+Version:       1.5.2
 Release:       1
 License:       GPL v2+
 Group:         Applications/System
 Source0:       http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
-# Source0-md5: 7df51649d029d187fb2e0dbb8f7ecb4d
-Patch0:                use-libnotify.patch
+# Source0-md5: 0235405a3a69b341ebce23e7fee9365e
 Patch1:                use-libwnck.patch
 URL:           http://wiki.mate-desktop.org/mate-notification-daemon
 BuildRequires: dbus-devel >= 0.78
@@ -44,7 +43,6 @@ Notification daemon for MATE Desktop.
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 
 %build

diff --git a/use-libnotify.patch b/use-libnotify.patch
deleted file mode 100644 (file)
index 6fbe903..0000000
--- a/use-libnotify.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- mate-notification-daemon-1.5.0/configure.ac.0000   2012-10-21 11:47:02.000000000 +0200
-+++ mate-notification-daemon-1.5.0/configure.ac        2013-01-21 00:24:44.730096960 +0100
-@@ -133,7 +133,7 @@ AC_SUBST(NOTIFICATION_DAEMON_LIBS)
- dnl ---------------------------------------------------------------------------
- dnl Requirements for the setup tool
- dnl ---------------------------------------------------------------------------
--PKG_CHECK_MODULES(NOTIFICATION_CAPPLET, glib-2.0 >= $REQ_GLIB_VERSION gio-2.0 >= $REQ_GIO_VERSION gtk+-$GTK_API_VERSION >= $GTK_REQUIRED libmatenotify dbus-1 dbus-glib-1)
-+PKG_CHECK_MODULES(NOTIFICATION_CAPPLET, glib-2.0 >= $REQ_GLIB_VERSION gio-2.0 >= $REQ_GIO_VERSION gtk+-$GTK_API_VERSION >= $GTK_REQUIRED libnotify dbus-1 dbus-glib-1)
- AC_SUBST(NOTIFICATION_CAPPLET_CFLAGS)
- AC_SUBST(NOTIFICATION_CAPPLET_LIBS)
- 
---- mate-notification-daemon-1.5.0/src/capplet/mate-notification-properties.c.0000     2012-10-21 11:47:02.000000000 +0200
-+++ mate-notification-daemon-1.5.0/src/capplet/mate-notification-properties.c  2013-01-21 00:31:35.201617517 +0100
-@@ -26,7 +26,7 @@
- #include <gtk/gtk.h>
- #include <gio/gio.h>
- #include <string.h>
--#include <libmatenotify/notify.h>
-+#include <libnotify/notify.h>
- 
- #include "stack.h"
- 
-@@ -311,7 +311,7 @@ static void notification_properties_dial
-               dialog->preview = NULL;
-       }
- 
--      dialog->preview = notify_notification_new(_("Notification Test"), _("Just a test"), "dialog-information", NULL);
-+      dialog->preview = notify_notification_new(_("Notification Test"), _("Just a test"), "dialog-information");
- 
-       if (!notify_notification_show(dialog->preview, &error))
-       {

diff --git a/use-libwnck.patch b/use-libwnck.patch
index 0e64dda936bc2da533a02ab2bd89c214da94614b..108111ad5fa6d7e14414a68fba103b2fd648552f 100644 (file)
--- a/use-libwnck.patch
+++ b/use-libwnck.patch
@@ -9,8 +9,8 @@
          x11 \
  "
  PKG_CHECK_MODULES(NOTIFICATION_DAEMON, $pkg_modules)
---- mate-notification-daemon-1.5.0/src/daemon/daemon.c.0001    2012-10-21 11:47:02.000000000 +0200
-+++ mate-notification-daemon-1.5.0/src/daemon/daemon.c 2013-02-17 02:56:21.691968653 +0100
+--- mate-notification-daemon-1.5.2/src/daemon/daemon.c~        2013-03-11 12:55:15.000000000 +0200
++++ mate-notification-daemon-1.5.2/src/daemon/daemon.c 2013-03-11 12:58:19.295122631 +0200
 @@ -42,7 +42,8 @@
  #include <X11/Xatom.h>
  #include <gdk/gdkx.h>
@@ -21,53 +21,52 @@
  
  #include "daemon.h"
  #include "engines.h"
-@@ -1147,36 +1148,36 @@ static gboolean screensaver_active(GtkWi
+@@ -1148,36 +1148,36 @@
  
  static gboolean fullscreen_window_exists(GtkWidget* nw)
  {
 -      MatewnckScreen* matewnck_screen;
 -      MatewnckWorkspace* matewnck_workspace;
-+      WnckScreen* wnck_screen;
-+      WnckWorkspace* wnck_workspace;
++      WnckScreen* matewnck_screen;
++      WnckWorkspace* matewnck_workspace;
        GList* l;
  
        #if (GDK_PIXBUF_MAJOR == 2) && (GDK_PIXBUF_MINOR < 22)
 -              matewnck_screen = matewnck_screen_get(GDK_SCREEN_XNUMBER(gdk_window_get_screen(gtk_widget_get_window(nw))));
-+              wnck_screen = wnck_screen_get(GDK_SCREEN_XNUMBER(gdk_window_get_screen(gtk_widget_get_window(nw))));
++              matewnck_screen = wnck_screen_get(GDK_SCREEN_XNUMBER(gdk_window_get_screen(gtk_widget_get_window(nw))));
        #else
 -              matewnck_screen = matewnck_screen_get(GDK_SCREEN_XNUMBER(gdk_drawable_get_screen(GDK_DRAWABLE(GTK_WIDGET(nw)->window))));
-+              wnck_screen = wnck_screen_get(GDK_SCREEN_XNUMBER(gdk_drawable_get_screen(GDK_DRAWABLE(GTK_WIDGET(nw)->window))));
++              matewnck_screen = wnck_screen_get(GDK_SCREEN_XNUMBER(gdk_drawable_get_screen(GDK_DRAWABLE(GTK_WIDGET(nw)->window))));
        #endif
  
--    matewnck_screen_force_update (matewnck_screen);
-+    wnck_screen_force_update (wnck_screen);
+-      matewnck_screen_force_update (matewnck_screen);
++      wnck_screen_force_update (matewnck_screen);
  
 -      matewnck_workspace = matewnck_screen_get_active_workspace (matewnck_screen);
-+      wnck_workspace = wnck_screen_get_active_workspace (wnck_screen);
++      matewnck_workspace = wnck_screen_get_active_workspace (matewnck_screen);
  
 -      for (l = matewnck_screen_get_windows_stacked (matewnck_screen); l != NULL; l = l->next)
-+      for (l = wnck_screen_get_windows_stacked (wnck_screen); l != NULL; l = l->next)
++      for (l = wnck_screen_get_windows_stacked (matewnck_screen); l != NULL; l = l->next)
        {
 -              MatewnckWindow *matewnck_win = (MatewnckWindow *) l->data;
-+              WnckWindow *wnck_win = (WnckWindow *) l->data;
++              WnckWindow *matewnck_win = (WnckWindow *) l->data;
  
 -              if (matewnck_window_is_on_workspace (matewnck_win, matewnck_workspace) && matewnck_window_is_fullscreen (matewnck_win) && matewnck_window_is_active (matewnck_win))
-+              if (wnck_window_is_on_workspace (wnck_win, wnck_workspace) && wnck_window_is_fullscreen (wnck_win) && wnck_window_is_active (wnck_win))
++              if (wnck_window_is_on_workspace (matewnck_win, matewnck_workspace) && wnck_window_is_fullscreen (matewnck_win) && wnck_window_is_active (matewnck_win))
                {
                        /*
                         * Sanity check if the window is _really_ fullscreen to
--                       * work around a bug in libmatewnck that doesn't get all
-+                       * work around a bug in libwnck that doesn't get all
+                        * work around a bug in libmatewnck that doesn't get all
                         * unfullscreen events.
                         */
 -                      int sw = matewnck_screen_get_width (matewnck_screen);
 -                      int sh = matewnck_screen_get_height (matewnck_screen);
-+                      int sw = wnck_screen_get_width (wnck_screen);
-+                      int sh = wnck_screen_get_height (wnck_screen);
++                      int sw = wnck_screen_get_width (matewnck_screen);
++                      int sh = wnck_screen_get_height (matewnck_screen);
                        int x, y, w, h;
  
 -                      matewnck_window_get_geometry (matewnck_win, &x, &y, &w, &h);
-+                      wnck_window_get_geometry (wnck_win, &x, &y, &w, &h);
++                      wnck_window_get_geometry (matewnck_win, &x, &y, &w, &h);
  
                        if (sw == w && sh == h)
                        {