use-libnotify.patch

   1 --- mate-settings-daemon-1.5.5/./plugins/xrandr/Makefile.am~    2013-02-08 01:25:01.000000000 +0200
   2 +++ mate-settings-daemon-1.5.5/./plugins/xrandr/Makefile.am     2013-02-18 22:09:42.379069593 +0200
   3 @@ -54,7 +54,7 @@
   4
   5  libxrandr_la_CFLAGS =                  \
   6         $(SETTINGS_PLUGIN_CFLAGS)       \
   7 -       $(LIBMATENOTIFY_CFLAGS)         \
   8 +       $(LIBNOTIFY_CFLAGS)             \
   9         $(MATE_DESKTOP_CFLAGS)          \
  10         $(AM_CFLAGS)
  11
  12 @@ -63,7 +63,7 @@
  13
  14  libxrandr_la_LIBADD  =                 \
  15         $(SETTINGS_PLUGIN_LIBS)         \
  16 -       $(LIBMATENOTIFY_LIBS)           \
  17 +       $(LIBNOTIFY_LIBS)               \
  18         $(MATE_DESKTOP_LIBS)
  19
  20  plugin_in_files =                      \
  21 --- mate-settings-daemon-1.5.5/plugins/xrandr/msd-xrandr-manager.c      2013-02-18 22:25:36.719541100 +0200
  22 +++ mate-settings-daemon-1.5.5/plugins/xrandr/msd-xrandr-manager.c      2013-02-26 00:46:56.115307180 +0200
  23 @@ -46,8 +46,8 @@
  24  #include <libmateui/mate-rr.h>
  25  #include <libmateui/mate-rr-labeler.h>
  26
  27 -#ifdef HAVE_LIBMATENOTIFY
  28 -#include <libmatenotify/notify.h>
  29 +#ifdef HAVE_LIBNOTIFY
  30 +#include <libnotify/notify.h>
  31  #endif
  32
  33  #include "mate-settings-profile.h"
  34 @@ -1079,22 +1079,20 @@
  35  static void
  36  error_message (MsdXrandrManager *mgr, const char *primary_text, GError *error_to_display, const char *secondary_text)
  37  {
  38 -#ifdef HAVE_LIBMATENOTIFY
  39 +#ifdef HAVE_LIBNOTIFY
  40          MsdXrandrManagerPrivate *priv = mgr->priv;
  41          NotifyNotification *notification;
  42
  43          g_assert (error_to_display == NULL || secondary_text == NULL);
  44
  45          if (priv->status_icon)
  46 -                notification = notify_notification_new_with_status_icon (primary_text,
  47 -                                                                         error_to_display ? error_to_display->message : secondary_text,
  48 -                                                                         MSD_XRANDR_ICON_NAME,
  49 -                                                                         priv->status_icon);
  50 +                notification = notify_notification_new (primary_text,
  51 +                                                        error_to_display ? error_to_display->message : secondary_text,
  52 +                                                        gtk_status_icon_get_icon_name(priv->status_icon));
  53          else
  54                  notification = notify_notification_new (primary_text,
  55                                                          error_to_display ? error_to_display->message : secondary_text,
  56 -                                                        MSD_XRANDR_ICON_NAME,
  57 -                                                        NULL);
  58 +                                                        MSD_XRANDR_ICON_NAME);
  59
  60          notify_notification_show (notification, NULL); /* NULL-GError */
  61  #else
  62 @@ -1107,7 +1105,7 @@
  63
  64          gtk_dialog_run (GTK_DIALOG (dialog));
  65          gtk_widget_destroy (dialog);
  66 -#endif /* HAVE_LIBMATENOTIFY */
  67 +#endif /* HAVE_LIBNOTIFY */
  68  }
  69
  70  static void
  71 --- mate-settings-daemon-1.5.5/./plugins/a11y-keyboard/Makefile.am~     2013-02-08 01:25:01.000000000 +0200
  72 +++ mate-settings-daemon-1.5.5/./plugins/a11y-keyboard/Makefile.am      2013-02-18 22:10:28.794534045 +0200
  73 @@ -52,7 +52,7 @@
  74
  75  liba11y_keyboard_la_CFLAGS = \
  76         $(SETTINGS_PLUGIN_CFLAGS)       \
  77 -       $(LIBMATENOTIFY_CFLAGS)         \
  78 +       $(LIBNOTIFY_CFLAGS)             \
  79         $(AM_CFLAGS)
  80
  81  liba11y_keyboard_la_LDFLAGS =          \
  82 @@ -62,7 +62,7 @@
  83  liba11y_keyboard_la_LIBADD  =          \
  84         $(SETTINGS_PLUGIN_LIBS)         \
  85         $(XF86MISC_LIBS)                \
  86 -       $(LIBMATENOTIFY_LIBS)           \
  87 +       $(LIBNOTIFY_LIBS)               \
  88         $(NULL)
  89
  90  plugin_in_files =              \
  91 --- mate-settings-daemon-1.5.5/plugins/a11y-keyboard/msd-a11y-keyboard-manager.c        2013-02-18 22:10:59.255932639 +0200
  92 +++ mate-settings-daemon-1.5.5/plugins/a11y-keyboard/msd-a11y-keyboard-manager.c        2013-02-18 22:20:31.682202641 +0200
  93 @@ -46,9 +46,9 @@
  94  #include <X11/extensions/XIproto.h>
  95  #endif
  96
  97 -#ifdef HAVE_LIBMATENOTIFY
  98 -#include <libmatenotify/notify.h>
  99 -#endif /* HAVE_LIBMATENOTIFY */
 100 +#ifdef HAVE_LIBNOTIFY
 101 +#include <libnotify/notify.h>
 102 +#endif /* HAVE_LIBNOTIFY */
 103
 104  #include "mate-settings-profile.h"
 105  #include "msd-a11y-keyboard-manager.h"
 106 @@ -72,9 +72,9 @@
 107
 108          GSettings  *settings;
 109
 110 -#ifdef HAVE_LIBMATENOTIFY
 111 +#ifdef HAVE_LIBNOTIFY
 112          NotifyNotification *notification;
 113 -#endif /* HAVE_LIBMATENOTIFY */
 114 +#endif /* HAVE_LIBNOTIFY */
 115  };
 116
 117  static void     msd_a11y_keyboard_manager_class_init  (MsdA11yKeyboardManagerClass *klass);
 118 @@ -497,7 +497,7 @@
 119          gtk_status_icon_set_visible (manager->priv->status_icon, show);
 120  }
 121
 122 -#ifdef HAVE_LIBMATENOTIFY
 123 +#ifdef HAVE_LIBNOTIFY
 124  static void
 125  on_notification_closed (NotifyNotification     *notification,
 126                          MsdA11yKeyboardManager *manager)
 127 @@ -558,13 +558,13 @@
 128          }
 129  }
 130
 131 -#endif /* HAVE_LIBMATENOTIFY */
 132 +#endif /* HAVE_LIBNOTIFY */
 133
 134  static gboolean
 135  ax_slowkeys_warning_post_bubble (MsdA11yKeyboardManager *manager,
 136                                   gboolean                enabled)
 137  {
 138 -#ifdef HAVE_LIBMATENOTIFY
 139 +#ifdef HAVE_LIBNOTIFY
 140          gboolean    res;
 141          const char *title;
 142          const char *message;
 143 @@ -591,8 +591,7 @@
 144          msd_a11y_keyboard_manager_ensure_status_icon (manager);
 145          manager->priv->notification = notify_notification_new (title,
 146                                                                 message,
 147 -                                                               "preferences-desktop-accessibility",
 148 -                                                               NULL);
 149 +                                                               "preferences-desktop-accessibility");
 150          notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
 151          notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
 152
 153 @@ -625,7 +624,7 @@
 154          return res;
 155  #else
 156          return FALSE;
 157 -#endif /* HAVE_LIBMATENOTIFY */
 158 +#endif /* HAVE_LIBNOTIFY */
 159  }
 160
 161
 162 @@ -700,7 +699,7 @@
 163  ax_stickykeys_warning_post_bubble (MsdA11yKeyboardManager *manager,
 164                                     gboolean                enabled)
 165  {
 166 -#ifdef HAVE_LIBMATENOTIFY
 167 +#ifdef HAVE_LIBNOTIFY
 168          gboolean    res;
 169          const char *title;
 170          const char *message;
 171 @@ -730,8 +729,7 @@
 172          msd_a11y_keyboard_manager_ensure_status_icon (manager);
 173          manager->priv->notification = notify_notification_new (title,
 174                                                                 message,
 175 -                                                               "preferences-desktop-accessibility",
 176 -                                                               NULL);
 177 +                                                               "preferences-desktop-accessibility");
 178          notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
 179          notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
 180
 181 @@ -764,7 +762,7 @@
 182          return res;
 183  #else
 184          return FALSE;
 185 -#endif /* HAVE_LIBMATENOTIFY */
 186 +#endif /* HAVE_LIBNOTIFY */
 187  }
 188
 189  static void
 190 @@ -1250,9 +1248,9 @@
 191  {
 192          manager->priv = MSD_A11Y_KEYBOARD_MANAGER_GET_PRIVATE (manager);
 193
 194 -#ifdef HAVE_LIBMATENOTIFY
 195 +#ifdef HAVE_LIBNOTIFY
 196          notify_init ("mate-settings-daemon");
 197 -#endif /* HAVE_LIBMATENOTIFY */
 198 +#endif /* HAVE_LIBNOTIFY */
 199  }
 200
 201  static void
 202 --- mate-settings-daemon-1.5.5/./plugins/housekeeping/Makefile.am~      2013-02-08 01:25:01.000000000 +0200
 203 +++ mate-settings-daemon-1.5.5/./plugins/housekeeping/Makefile.am       2013-02-18 22:11:49.998262432 +0200
 204 @@ -20,12 +20,12 @@
 205  libhousekeeping_la_CFLAGS =            \
 206         $(SETTINGS_PLUGIN_CFLAGS)       \
 207         $(GIOUNIX_CFLAGS)               \
 208 -       $(LIBMATENOTIFY_CFLAGS)         \
 209 +       $(LIBNOTIFY_CFLAGS)             \
 210         $(AM_CFLAGS)
 211
 212  libhousekeeping_la_LDFLAGS = $(MSD_PLUGIN_LDFLAGS)
 213
 214 -libhousekeeping_la_LIBADD = $(SETTINGS_PLUGIN_LIBS) $(GIOUNIX_LIBS) $(LIBMATENOTIFY_LIBS)
 215 +libhousekeeping_la_LIBADD = $(SETTINGS_PLUGIN_LIBS) $(GIOUNIX_LIBS) $(LIBNOTIFY_LIBS)
 216
 217  plugin_in_files = housekeeping.mate-settings-plugin.in
 218
 219 --- mate-settings-daemon-1.5.5/./plugins/housekeeping/msd-disk-space.c~ 2013-02-08 01:25:01.000000000 +0200
 220 +++ mate-settings-daemon-1.5.5/./plugins/housekeeping/msd-disk-space.c  2013-02-18 22:12:03.545551115 +0200
 221 @@ -21,7 +21,7 @@
 222   *
 223   */
 224
 225 -/* gcc -DHAVE_LIBMATENOTIFY -DTEST -Wall `pkg-config --cflags --libs gobject-2.0 gio-unix-2.0 glib-2.0 gtk+-2.0 libmatenotify` -o msd-disk-space-test msd-disk-space.c */
 226 +/* gcc -DHAVE_LIBNOTIFY -DTEST -Wall `pkg-config --cflags --libs gobject-2.0 gio-unix-2.0 glib-2.0 gtk+-2.0 libnotify` -o msd-disk-space-test msd-disk-space.c */
 227
 228  #include "config.h"
 229
 230 --- mate-settings-daemon-1.5.5/./configure.ac~  2013-02-08 01:25:01.000000000 +0200
 231 +++ mate-settings-daemon-1.5.5/./configure.ac   2013-02-18 22:13:56.937424046 +0200
 232 @@ -53,7 +53,7 @@
 233  GTK_REQUIRED_VERSION=2.24.0
 234  GIO_REQUIRED_VERSION=2.26.0
 235  MATE_DESKTOP_REQUIRED_VERSION=1.5.0
 236 -LIBMATENOTIFY_REQUIRED_VERSION=1.1.0
 237 +LIBNOTIFY_REQUIRED_VERSION=0.7.5
 238
 239  EXTRA_COMPILE_WARNINGS(yes)
 240
 241 @@ -90,24 +90,24 @@
 242  PKG_CHECK_MODULES(MATE_DESKTOP, mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED_VERSION)
 243
 244  dnl ---------------------------------------------------------------------------
 245 -dnl - Check for libmatenotify
 246 +dnl - Check for libnotify
 247  dnl ---------------------------------------------------------------------------
 248
 249 -have_libmatenotify=no
 250 -AC_ARG_WITH(libmatenotify,
 251 -       AC_HELP_STRING([--without-libmatenotify], [Disable notifications (default: auto)]),
 252 -       with_libmatenotify=$withval, with_libmatenotify=auto)
 253 -
 254 -if test "x$with_libmatenotify" != "xno"; then
 255 -       PKG_CHECK_MODULES(LIBMATENOTIFY, libmatenotify >= $LIBMATENOTIFY_REQUIRED_VERSION,
 256 -                         [AC_DEFINE(HAVE_LIBMATENOTIFY, 1, [Define if libmatenotify is available])
 257 -                         have_libmatenotify=yes], have_libmatenotify=no)
 258 -       if test "x$have_libmatenotify" = xno -a "x$with_libmatenotify" = xyes; then
 259 -               AC_MSG_ERROR([libmatenotify support requested but libraries not found])
 260 +have_libnotify=no
 261 +AC_ARG_WITH(libnotify,
 262 +       AC_HELP_STRING([--without-libnotify], [Disable notifications (default: auto)]),
 263 +       with_libnotify=$withval, with_libnotify=auto)
 264 +
 265 +if test "x$with_libnotify" != "xno"; then
 266 +       PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED_VERSION,
 267 +                         [AC_DEFINE(HAVE_LIBNOTIFY, 1, [Define if libnotify is available])
 268 +                         have_libnotify=yes], have_libnotify=no)
 269 +       if test "x$have_libnotify" = xno -a "x$with_libnotify" = xyes; then
 270 +               AC_MSG_ERROR([libnotify support requested but libraries not found])
 271         fi
 272  fi
 273 -AC_SUBST(LIBMATENOTIFY_CFLAGS)
 274 -AC_SUBST(LIBMATENOTIFY_LIBS)
 275 +AC_SUBST(LIBNOTIFY_CFLAGS)
 276 +AC_SUBST(LIBNOTIFY_LIBS)
 277
 278  dnl ---------------------------------------------------------------------------
 279  dnl - Check for D-Bus
 280 @@ -520,7 +520,7 @@
 281      dbus-1 system.d dir:      ${DBUS_SYS_DIR}
 282      PolicyKit support:        ${HAVE_POLKIT}
 283
 284 -    Libmatenotify support:    ${have_libmatenotify}
 285 +    Libnotify support:        ${have_libnotify}
 286      GStreamer support:        ${have_gstreamer}
 287      PulseAudio support:       ${have_pulse}
 288      Smartcard support:        ${have_smartcard_support}