diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-01 21:29:17 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-01 21:29:17 -0300 |
commit | 5a1b7efd1dfd0d0a1f4a7a4b68ea7b69f06aa6d1 (patch) | |
tree | f2d8419cf544c9c1980e49a5a94f19252e17d4e7 /extra/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch | |
parent | 02380099f9ca13810767a2d25742c6862e255852 (diff) | |
parent | 40f0b1c7106cc1fed13f14e80f083ecd69c416f5 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/clementine/PKGBUILD
community/google-gadgets/PKGBUILD
community/redis/PKGBUILD
community/uzbl/PKGBUILD
extra/anjuta/PKGBUILD
extra/atkmm/PKGBUILD
extra/ekiga/PKGBUILD
extra/epiphany/PKGBUILD
extra/evolution-data-server/PKGBUILD
extra/gdl/PKGBUILD
extra/glade/PKGBUILD
extra/glibmm/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnome-desktop/PKGBUILD
extra/gnome-menus/PKGBUILD
extra/gnome-nettool/PKGBUILD
extra/gnome-panel/PKGBUILD
extra/gnome-sharp/PKGBUILD
extra/gtk2/PKGBUILD
extra/gtkmm/PKGBUILD
extra/libchamplain/PKGBUILD
extra/libgda/PKGBUILD
extra/libotr/PKGBUILD
extra/libvncserver/PKGBUILD
extra/libwebkit/PKGBUILD
extra/notification-daemon/PKGBUILD
extra/pangomm/PKGBUILD
extra/pidgin/PKGBUILD
extra/pygobject/PKGBUILD
extra/rasqal/PKGBUILD
extra/redland/PKGBUILD
extra/vte/PKGBUILD
extra/xarchiver/PKGBUILD
extra/yelp/PKGBUILD
testing/gnome-control-center/PKGBUILD
testing/mesa/PKGBUILD
testing/rasqal/PKGBUILD
testing/redland/PKGBUILD
Diffstat (limited to 'extra/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch')
-rw-r--r-- | extra/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch | 47 |
1 files changed, 11 insertions, 36 deletions
diff --git a/extra/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch b/extra/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch index 6159d139c..efc06a472 100644 --- a/extra/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch +++ b/extra/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch @@ -1,50 +1,25 @@ ---- src/notification_popup.c -+++ src/notification_popup.c -@@ -339,7 +339,16 @@ +diff -Nur claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_popup.c claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_popup.c +--- claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_popup.c 2009-04-26 03:05:05.000000000 +0200 ++++ claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_popup.c 2010-11-12 13:39:02.363909583 +0100 +@@ -339,7 +339,7 @@ break; } -+#ifdef NOTIFY_CHECK_VERSION -+#if NOTIFY_CHECK_VERSION (0, 7, 0) +- ppopup->notification = notify_notification_new(summary, utf8_str, NULL, NULL); + ppopup->notification = notify_notification_new(summary, utf8_str, NULL); -+#else - ppopup->notification = notify_notification_new(summary, utf8_str, NULL, NULL); -+#endif -+#else -+ ppopup->notification = notify_notification_new(summary, utf8_str, NULL, NULL); -+#endif -+ g_free(utf8_str); if(ppopup->notification == NULL) { debug_print("Notification Plugin: Failed to create a new " ---- src/notification_trayicon.c -+++ src/notification_trayicon.c -@@ -61,6 +61,10 @@ - #ifdef HAVE_LIBNOTIFY - #include <libnotify/notify.h> - -+#ifndef NOTIFY_CHECK_VERSION -+#define NOTIFY_CHECK_VERSION(x,y,z) 0 -+#endif -+ - typedef struct { - gint count; - gint num_mail; -@@ -601,8 +605,17 @@ +diff -Nur claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_trayicon.c claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_trayicon.c +--- claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_trayicon.c 2010-03-25 09:56:34.000000000 +0100 ++++ claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_trayicon.c 2010-11-12 13:38:30.809340907 +0100 +@@ -589,8 +589,7 @@ summary = notification_trayicon_popup_assemble_summary(); utf8_str = notification_trayicon_popup_assemble_body(msginfo); -+#if NOTIFY_CHECK_VERSION (0, 7, 0) +- popup.notification = notify_notification_new(summary, utf8_str, NULL, NULL); +- notify_notification_attach_to_status_icon(popup.notification, trayicon); + popup.notification = notify_notification_new(summary, utf8_str, NULL); -+#else - popup.notification = notify_notification_new(summary, utf8_str, NULL, NULL); -+#endif -+ -+#if NOTIFY_CHECK_VERSION (0, 7, 0) -+ /* notify_notification_attach_to_status_icon function was removed */ -+#else - notify_notification_attach_to_status_icon(popup.notification, trayicon); -+#endif g_free(summary); g_free(utf8_str); |