From 30b7ce2e63080fca1db9bdf2dd82955ce7ad2cc7 Mon Sep 17 00:00:00 2001 From: lukefromdc Date: Sun, 23 Oct 2016 18:39:57 -0400 Subject: 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 --- libcaja-private/caja-file-operations.c | 6 +++--- libcaja-private/caja-file-operations.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'libcaja-private') diff --git a/libcaja-private/caja-file-operations.c b/libcaja-private/caja-file-operations.c index f637274a..705a25b9 100644 --- a/libcaja-private/caja-file-operations.c +++ b/libcaja-private/caja-file-operations.c @@ -197,7 +197,7 @@ typedef struct { NotifyNotification *unmount_notify; #if ENABLE_LIBUNIQUE == (FALSE) void -caja_application_notification_unmount_show (const gchar *message) +caja_application_notify_unmount_show (const gchar *message) { gchar **strings; strings = g_strsplit (message, "\n", 0); @@ -2100,7 +2100,7 @@ unmount_mount_callback (GObject *source_object, g_error_free (error); } #if ENABLE_LIBUNIQUE == (FALSE) - caja_application_notification_unmount_show ("It is now safe to remove the drive"); + caja_application_notify_unmount_show ("It is now safe to remove the drive"); #endif eel_remove_weak_pointer (&data->parent_window); g_object_unref (data->mount); @@ -2121,7 +2121,7 @@ do_unmount (UnmountData *data) unmount_mount_callback, data); #if ENABLE_LIBUNIQUE == (FALSE) - caja_application_notification_unmount_show ("writing data to the drive-do not unplug"); + caja_application_notify_unmount_show ("writing data to the drive-do not unplug"); #endif } else { g_mount_unmount_with_operation (data->mount, diff --git a/libcaja-private/caja-file-operations.h b/libcaja-private/caja-file-operations.h index d95e275a..95ba3a3e 100644 --- a/libcaja-private/caja-file-operations.h +++ b/libcaja-private/caja-file-operations.h @@ -138,5 +138,6 @@ void caja_file_mark_desktop_file_trusted (GFile *file, CajaOpCallback done_callback, gpointer done_callback_data); +void caja_application_notify_unmount_show (const gchar *message); #endif /* CAJA_FILE_OPERATIONS_H */ -- cgit v1.2.1