4 files changed, 58 insertions, 42 deletions
diff --git a/drivemount/src/Makefile.am b/drivemount/src/Makefile.am
index 28b273c0..855e48e2 100644
--- a/drivemount/src/Makefile.am
+++ b/drivemount/src/Makefile.am
@@ -6,20 +6,14 @@ AM_CPPFLAGS = \
 -DDRIVEMOUNT_RESOURCE_PATH=\""/org/mate/mate-applets/drivemount/"\" \
 ${WARN_CFLAGS} \
 $(MATE_APPLETS4_CFLAGS) \
+ $(MATE_DESKTOP_CFLAGS) \
 $(NULL)
 
-libexec_PROGRAMS = mate-drivemount-applet
-
 BUILT_SOURCES = \
 drivemount-resources.c \
 drivemount-resources.h \
 $(NULL)
-
-nodist_mate_drivemount_applet_SOURCES = \
- $(BUILT_SOURCES) \
- $(NULL)
-
-mate_drivemount_applet_SOURCES = \
+APPLET_SOURCES = \
 drivemount.c \
 drive-list.c \
 drive-list.h \
@@ -27,8 +21,24 @@ mate_drivemount_applet_SOURCES = \
 drive-button.h \
 $(NULL)
 
-mate_drivemount_applet_LDADD = \
- $(MATE_APPLETS4_LIBS)
+APPLET_LIBS = $(MATE_APPLETS4_LIBS)
+
+if ENABLE_IN_PROCESS
+pkglib_LTLIBRARIES = libmate-drivemount-applet.la
+nodist_libmate_drivemount_applet_la_SOURCES = $(BUILT_SOURCES)
+libmate_drivemount_applet_la_SOURCES = $(APPLET_SOURCES)
+libmate_drivemount_applet_la_CFLAGS = $(AM_CFLAGS)
+libmate_drivemount_applet_la_LDFLAGS = -module -avoid-version
+libmate_drivemount_applet_la_LIBADD = $(APPLET_LIBS) \
+ $(MATE_DESKTOP_LIBS)
+else !ENABLE_IN_PROCESS
+libexec_PROGRAMS = mate-drivemount-applet
+nodist_mate_drivemount_applet_SOURCES = $(BUILT_SOURCES)
+mate_drivemount_applet_SOURCES = $(APPLET_SOURCES)
+mate_drivemount_applet_CFLAGS = $(AM_CFLAGS)
+mate_drivemount_applet_LDADD = $(APPLET_LIBS) \
+ $(MATE_DESKTOP_LIBS)
+endif !ENABLE_IN_PROCESS
 
 drivemount-resources.c: ../data/drivemount-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data/ --generate-dependencies $(srcdir)/../data/drivemount-resources.gresource.xml)
 $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data/ --generate --c-name drivemount $<
diff --git a/drivemount/src/drive-button.c b/drivemount/src/drive-button.c
index f64f38c4..d33600f0 100644
--- a/drivemount/src/drive-button.c
+++ b/drivemount/src/drive-button.c
@@ -31,6 +31,8 @@
 #include <gdk/gdkkeysyms.h>
 #include <gio/gdesktopappinfo.h>
 
+#include <libmate-desktop/mate-image-menu-item.h>
+
 #include <string.h>
 
 enum {
@@ -113,9 +115,10 @@ drive_button_new (GVolume *volume)
 self = g_object_new (DRIVE_TYPE_BUTTON, NULL);
 if (volume != NULL) {
 drive_button_set_volume (self, volume);
- g_signal_connect (gtk_icon_theme_get_default (),
- "changed", G_CALLBACK (drive_button_theme_change),
- self);
+
+ g_signal_connect (gtk_icon_theme_get_default (), "changed",
+ G_CALLBACK (drive_button_theme_change),
+ self);
 }
 
 return (GtkWidget *)self;
@@ -129,9 +132,9 @@ drive_button_new_from_mount (GMount *mount)
 self = g_object_new (DRIVE_TYPE_BUTTON, NULL);
 drive_button_set_mount (self, mount);
 
- g_signal_connect (gtk_icon_theme_get_default (),
- "changed", G_CALLBACK (drive_button_theme_change),
- self);
+ g_signal_connect (gtk_icon_theme_get_default (), "changed",
+ G_CALLBACK (drive_button_theme_change),
+ self);
 
 return (GtkWidget *)self;
 }
@@ -382,13 +385,12 @@ drive_button_update (gpointer user_data)
 g_free (color_string);
 g_object_unref (settings);
 
- guchar red = color.red*255;
- guchar green = color.green*255;
- guchar blue = color.blue*255;
+ guchar red = (guchar) (color.red * 255.0);
+ guchar green = (guchar) (color.green * 255.0);
+ guchar blue = (guchar) (color.blue * 255.0);
 
- const gdouble ratio = 0.65;
- gdouble y_start = icon_height * ratio;
- gdouble x_start = icon_height * (1 + ratio);
+ int y_start = (int) (0.65 * (gdouble) icon_height);
+ int x_start = (int) (1.65 * (gdouble) icon_height);
 
 for (y = y_start; y < icon_height; y++)
 for (x = x_start - y; x < icon_width; x++)
@@ -531,14 +533,15 @@ create_menu_item (DriveButton *self,
 {
 GtkWidget *item, *image;
 
- item = gtk_image_menu_item_new_with_mnemonic (label);
+ item = mate_image_menu_item_new_with_mnemonic (label);
 if (icon_name) {
 image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+ mate_image_menu_item_set_image (MATE_IMAGE_MENU_ITEM (item), image);
 gtk_widget_show (image);
 }
 if (callback)
- g_signal_connect_object (item, "activate", callback, self,
+ g_signal_connect_object (item, "activate",
+ callback, self,
 G_CONNECT_SWAPPED);
 gtk_widget_set_sensitive (item, sensitive);
 gtk_widget_show (item);
@@ -599,8 +602,11 @@ open_drive (DriveButton *self,
 gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", error->message);
 else
 gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "Could not find Caja");
+
 g_signal_connect (dialog, "response",
- G_CALLBACK (gtk_widget_destroy), NULL);
+ G_CALLBACK (gtk_widget_destroy),
+ NULL);
+
 gtk_widget_show (dialog);
 g_error_free (error);
 }
diff --git a/drivemount/src/drive-list.c b/drivemount/src/drive-list.c
index b1840051..21d5ee5c 100644
--- a/drivemount/src/drive-list.c
+++ b/drivemount/src/drive-list.c
@@ -87,17 +87,17 @@ drive_list_init (DriveList *self)
 if (!volume_monitor)
 volume_monitor = g_volume_monitor_get ();
 
- g_signal_connect_object (volume_monitor, "mount_added",
+ g_signal_connect_object (volume_monitor, "mount-added",
 G_CALLBACK (mount_added), self, 0);
- g_signal_connect_object (volume_monitor, "mount_changed",
+ g_signal_connect_object (volume_monitor, "mount-changed",
 G_CALLBACK (mount_changed), self, 0);
- g_signal_connect_object (volume_monitor, "mount_removed",
+ g_signal_connect_object (volume_monitor, "mount-removed",
 G_CALLBACK (mount_removed), self, 0);
- g_signal_connect_object (volume_monitor, "volume_added",
+ g_signal_connect_object (volume_monitor, "volume-added",
 G_CALLBACK (volume_added), self, 0);
- g_signal_connect_object (volume_monitor, "volume_changed",
+ g_signal_connect_object (volume_monitor, "volume-changed",
 G_CALLBACK (volume_changed), self, 0);
- g_signal_connect_object (volume_monitor, "volume_removed",
+ g_signal_connect_object (volume_monitor, "volume-removed",
 G_CALLBACK (volume_removed), self, 0);
 volumes = g_volume_monitor_get_volumes (volume_monitor);
 for (tmp = volumes; tmp != NULL; tmp = tmp->next) {
@@ -464,7 +464,6 @@ set_icon_size (gpointer key,
 drive_button_set_size (button, self->icon_size);
 }
 
-
 void
 drive_list_set_panel_size (DriveList *self,
 int panel_size)
diff --git a/drivemount/src/drivemount.c b/drivemount/src/drivemount.c
index d6a77f20..408c7645 100644
--- a/drivemount/src/drivemount.c
+++ b/drivemount/src/drivemount.c
@@ -118,7 +118,7 @@ display_about_dialog (GtkAction *action,
 "title", _("About Disk Mounter"),
 "version", VERSION,
 "copyright", _("Copyright \xC2\xA9 2004 Canonical Ltd\n"
- "Copyright \xc2\xa9 2012-2020 MATE developers"),
+ "Copyright \xc2\xa9 2012-2021 MATE developers"),
 "comments", _("Applet for mounting and unmounting block volumes."),
 "authors", authors,
 "documenters", documenters,
@@ -179,7 +179,9 @@ applet_factory (MatePanelApplet *applet,
 GtkActionGroup *action_group;
 
 if (!strcmp (iid, drivemount_iid)) {
+#ifndef ENABLE_IN_PROCESS
 g_set_application_name (_("Disk Mounter"));
+#endif
 
 gtk_window_set_default_icon_name ("media-floppy");
 
@@ -189,11 +191,11 @@ applet_factory (MatePanelApplet *applet,
 
 gtk_container_add (GTK_CONTAINER (applet), drive_list);
 
- g_signal_connect_object (applet, "change_orient",
+ g_signal_connect_object (applet, "change-orient",
 G_CALLBACK (change_orient), drive_list, 0);
- g_signal_connect_object (applet, "size_allocate",
+ g_signal_connect_object (applet, "size-allocate",
 G_CALLBACK (size_allocate), drive_list, 0);
- g_signal_connect (applet, "change_background",
+ g_signal_connect (applet, "change-background",
 G_CALLBACK (change_background), drive_list);
 
 /* set initial state */
@@ -223,8 +225,7 @@ applet_factory (MatePanelApplet *applet,
 return ret;
 }
 
-MATE_PANEL_APPLET_OUT_PROCESS_FACTORY (factory_iid,
- PANEL_TYPE_APPLET,
- "Drive-Mount-Applet",
- applet_factory, NULL)
-
+PANEL_APPLET_FACTORY (factory_iid,
+ PANEL_TYPE_APPLET,
+ "Drive-Mount-Applet",
+ applet_factory, NULL)