diff options
Diffstat (limited to 'drivemount/src')
| -rw-r--r-- | drivemount/src/Makefile.am | 30 | ||||
| -rw-r--r-- | drivemount/src/drive-button.c | 6 | ||||
| -rw-r--r-- | drivemount/src/drivemount.c | 11 |
3 files changed, 30 insertions, 17 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 e0b86bf1..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 { @@ -531,10 +533,10 @@ 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) diff --git a/drivemount/src/drivemount.c b/drivemount/src/drivemount.c index a425237b..408c7645 100644 --- a/drivemount/src/drivemount.c +++ b/drivemount/src/drivemount.c @@ -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"); @@ -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) |