Refactor notification code to remove duplicate function

The desktop icon eject code required a function in libcaja-private so we no longer need it in caja-application.c

2 files changed, 4 insertions, 32 deletions

diff --git a/src/caja-application.c b/src/caja-application.c
index e1d8a892..dff984f3 100644
--- a/src/caja-application.c
+++ b/src/caja-application.c
@@ -159,36 +159,8 @@ struct _CajaApplicationPriv {
     gboolean force_desktop;
     gboolean autostart;
     gchar *geometry;
-    NotifyNotification *unmount_notify;
 };
 
-void
-caja_application_notify_unmount_show (CajaApplication *application,
-                                          const gchar *message)
-{
-    gchar **strings;
-
-    strings = g_strsplit (message, "\n", 0);
-
-    if (application->priv->unmount_notify == NULL) {
-        application->priv->unmount_notify =
-                        notify_notification_new (strings[0], strings[1],
-                                                 "media-removable");
-
-        notify_notification_set_hint (application->priv->unmount_notify,
-                                      "transient", g_variant_new_boolean (TRUE));
-        notify_notification_set_urgency (application->priv->unmount_notify,
-                                         NOTIFY_URGENCY_CRITICAL);
-    } else {
-        notify_notification_update (application->priv->unmount_notify,
-                                    strings[0], strings[1],
-                                    "media-removable");
-    }
-
-    notify_notification_show (application->priv->unmount_notify, NULL);
-    g_strfreev (strings);
-}
-
 #else
 G_DEFINE_TYPE (CajaApplication, caja_application, G_TYPE_OBJECT);
 
diff --git a/src/caja-places-sidebar.c b/src/caja-places-sidebar.c
index ae0434e2..9b67e64d 100644
--- a/src/caja-places-sidebar.c
+++ b/src/caja-places-sidebar.c
@@ -2249,7 +2249,7 @@ drive_eject_cb (GObject *source_object,
 #if ENABLE_LIBUNIQUE == (FALSE)
     else {
         CajaApplication *app = CAJA_APPLICATION (g_application_get_default ());
-        caja_application_notify_unmount_show (app, "It is now safe to remove the drive");
+        caja_application_notify_unmount_show ("It is now safe to remove the drive");
     }
 #endif
 }
@@ -2286,7 +2286,7 @@ volume_eject_cb (GObject *source_object,
 #if ENABLE_LIBUNIQUE == (FALSE)
     else {
         CajaApplication *app = CAJA_APPLICATION (g_application_get_default ());
-        caja_application_notify_unmount_show (app, "It is now safe to remove the drive");
+        caja_application_notify_unmount_show ("It is now safe to remove the drive");
     }
 #endif
 }
@@ -2323,7 +2323,7 @@ mount_eject_cb (GObject *source_object,
 #if ENABLE_LIBUNIQUE == (FALSE)
     else {
         CajaApplication *app = CAJA_APPLICATION (g_application_get_default ());
-        caja_application_notify_unmount_show (app, "It is now safe to remove the drive");
+        caja_application_notify_unmount_show ("It is now safe to remove the drive");
     }
 #endif
 }
@@ -2359,7 +2359,7 @@ do_eject (GMount *mount,
     }
 #if ENABLE_LIBUNIQUE == (FALSE)
     CajaApplication *app = CAJA_APPLICATION (g_application_get_default ());
-    caja_application_notify_unmount_show (app, "writing data to the drive-do not unplug");
+    caja_application_notify_unmount_show ("writing data to the drive-do not unplug");
 #endif
     g_object_unref (mount_op);
 }