port from libnotify to GNotification

Author: okaestne

src/nemo-application.c

@@ -75,7 +75,6 @@
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-string.h>
-#include <libnotify/notify.h>
 #include <libxapp/xapp-favorites.h>
 
 #define GNOME_DESKTOP_USE_UNSTABLE_API
@@ -552,7 +551,6 @@ nemo_application_startup (GApplication *app)
 	init_menu_provider_callback ();
 
 	/* Initialize the UI handler singleton for file operations */
-	notify_init (GETTEXT_PACKAGE);
 	self->priv->progress_handler = nemo_progress_ui_handler_new ();
 
     self->priv->cache_problem = FALSE;

src/nemo-desktop-application.c

@@ -62,7 +62,6 @@
 #include <stdlib.h>
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
-#include <libnotify/notify.h>
 #include <gdk/gdkx.h>
 #include <X11/Xatom.h>
 

src/nemo-main-application.c

@@ -73,7 +73,6 @@
 #include <gio/gio.h>
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-stock-dialogs.h>
-#include <libnotify/notify.h>
 
 #define GNOME_DESKTOP_USE_UNSTABLE_API
 
@@ -90,6 +89,10 @@
 /* Disable the self-check functionality */
 #define NEMO_OMIT_SELF_CHECK "omit"
 
+#define NEMO_NOTIFICATION_UNMOUNT_ICON_NAME  "media-removable"
+#define NEMO_NOTIFICATION_UNMOUNT_ID_PENDING "unmount-pending"
+#define NEMO_NOTIFICATION_UNMOUNT_ID_DONE    "unmount-done"
+
 static void     mount_removed_callback            (GVolumeMonitor            *monitor,
 						   GMount                    *mount,
 						   NemoMainApplication       *application);
@@ -106,61 +109,67 @@ struct _NemoMainApplicationPriv {
 	NemoFreedesktopDBus *fdb_manager;
 
 	gchar *geometry;
-
-    NotifyNotification *unmount_notify;
 };
 
 static void
-nemo_main_application_notify_unmount_done (NemoApplication *application,
-                                           const gchar     *message)
+nemo_main_application_send_notification (NemoApplication *application,
+                                         const gchar *title,
+                                         const gchar *body,
+                                         const gchar *icon_name,
+                                         const gchar *notification_id,
+                                         const GNotificationPriority prio)
 {
-    NemoMainApplication *app = NEMO_MAIN_APPLICATION (application);
+	NemoMainApplication *app = NEMO_MAIN_APPLICATION (application);
+	GNotification *notification;
+	GIcon *icon;
 
-    if (app->priv->unmount_notify) {
-        notify_notification_close (app->priv->unmount_notify, NULL);
-        g_clear_object (&app->priv->unmount_notify);
-    }
+	icon = g_themed_icon_new (icon_name);
+	notification = g_notification_new (title);
+	g_notification_set_body (notification, body);
+	g_notification_set_icon (notification, icon);
+	g_notification_set_priority (notification, prio);
 
-    if (message != NULL) {
-        NotifyNotification *unplug;
-        gchar **strings;
+	g_application_send_notification (G_APPLICATION (app), notification_id, notification);
 
-        strings = g_strsplit (message, "\n", 0);
-        unplug = notify_notification_new (strings[0], strings[1],
-                                          "media-removable");
-
-        notify_notification_show (unplug, NULL);
-        g_object_unref (unplug);
-        g_strfreev (strings);
-    }
+	g_object_unref (notification);
+	g_object_unref (icon);
 }
 
 static void
-nemo_main_application_notify_unmount_show (NemoApplication *application,
+nemo_main_application_notify_unmount_done (NemoApplication *application,
                                            const gchar     *message)
 {
-    NemoMainApplication *app = NEMO_MAIN_APPLICATION (application);
+	NemoMainApplication *app = NEMO_MAIN_APPLICATION (application);
+	gchar **strings;
 
-    gchar **strings;
+	// remove notification for pending unmount state
+	g_application_withdraw_notification (G_APPLICATION (app), NEMO_NOTIFICATION_UNMOUNT_ID_PENDING);
 
-    strings = g_strsplit (message, "\n", 0);
+	g_return_if_fail (message != NULL);
+	strings = g_strsplit (message, "\n", 2);
 
-    if (!app->priv->unmount_notify) {
-        app->priv->unmount_notify = notify_notification_new (strings[0], strings[1],
-                                                             "media-removable");
+	nemo_main_application_send_notification (application, strings[0], strings[1],
+	                                         NEMO_NOTIFICATION_UNMOUNT_ICON_NAME,
+	                                         NEMO_NOTIFICATION_UNMOUNT_ID_DONE,
+	                                         G_NOTIFICATION_PRIORITY_NORMAL);
+	
+	g_strfreev (strings);
+}
 
-        notify_notification_set_hint (app->priv->unmount_notify,
-                                      "transient", g_variant_new_boolean (TRUE));
-        notify_notification_set_urgency (app->priv->unmount_notify,
-                                         NOTIFY_URGENCY_CRITICAL);
-    } else {
-        notify_notification_update (app->priv->unmount_notify,
-                                    strings[0], strings[1],
-                                    "media-removable");
-    }
+static void
+nemo_main_application_notify_unmount_show (NemoApplication *application,
+                                           const gchar     *message)
+{
+	gchar **strings;
+
+	g_return_if_fail (message != NULL);
+	strings = g_strsplit (message, "\n", 2);
 
-    notify_notification_show (app->priv->unmount_notify, NULL);
-    g_strfreev (strings);
+	nemo_main_application_send_notification (application, strings[0], strings[1],
+	                                         NEMO_NOTIFICATION_UNMOUNT_ICON_NAME,
+	                                         NEMO_NOTIFICATION_UNMOUNT_ID_PENDING,
+	                                         G_NOTIFICATION_PRIORITY_URGENT);
+	g_strfreev (strings);
 }
 
 static void

src/nemo-places-sidebar.c

@@ -61,8 +61,6 @@
 #include "nemo-window.h"
 #include "nemo-window-slot.h"
 
-#include <libnotify/notify.h>
-
 #define DEBUG_FLAG NEMO_DEBUG_PLACES
 #include <libnemo-private/nemo-debug.h>
 
@@ -130,8 +128,6 @@ typedef struct {
 	NemoWindowSlot *go_to_after_mount_slot;
 	NemoWindowOpenFlags go_to_after_mount_flags;
 
-    NotifyNotification *unmount_notify;
-
 	guint bookmarks_changed_id;
 
     gboolean my_computer_expanded;
@@ -4413,7 +4409,6 @@ nemo_places_sidebar_dispose (GObject *object)
 	sidebar->uri = NULL;
 
 	free_drag_data (sidebar);
-    g_clear_object (&sidebar->unmount_notify);
 
 	if (sidebar->bookmarks_changed_id != 0) {
 		g_signal_handler_disconnect (sidebar->bookmarks,

src/nemo-progress-ui-handler.c

@@ -31,14 +31,14 @@
 #include "nemo-application.h"
 #include "nemo-progress-info-widget.h"
 
+#include <gio/gio.h>
 #include <glib/gi18n.h>
 
 #include <eel/eel-string.h>
 
 #include <libnemo-private/nemo-progress-info.h>
 #include <libnemo-private/nemo-progress-info-manager.h>
 
-#include <libnotify/notify.h>
 #include <libxapp/xapp-gtk-window.h>
 #include <libxapp/xapp-status-icon.h>
 
@@ -262,13 +262,12 @@ progress_ui_handler_add_to_window (NemoProgressUIHandler *self,
 static void
 progress_ui_handler_show_complete_notification (NemoProgressUIHandler *self)
 {
-	NotifyNotification *complete_notification;
-
-	complete_notification = notify_notification_new (_("File Operations"),
-							 _("All file operations have been successfully completed"),
-							 NULL);
-	notify_notification_show (complete_notification, NULL);
+	GNotification *complete_notification;
 
+	complete_notification = g_notification_new (_("File Operations"));
+	g_notification_set_body (complete_notification, _("All file operations have been successfully completed"));
+	
+	g_application_send_notification (G_APPLICATION (nemo_application_get_singleton ()), NULL, complete_notification);
 	g_object_unref (complete_notification);
 }