summaryrefslogtreecommitdiff
path: root/drivemount
diff options
context:
space:
mode:
Diffstat (limited to 'drivemount')
-rw-r--r--drivemount/src/Makefile.am7
-rw-r--r--drivemount/src/drive-button.c6
2 files changed, 9 insertions, 4 deletions
diff --git a/drivemount/src/Makefile.am b/drivemount/src/Makefile.am
index a887b1e5..855e48e2 100644
--- a/drivemount/src/Makefile.am
+++ b/drivemount/src/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
-DDRIVEMOUNT_RESOURCE_PATH=\""/org/mate/mate-applets/drivemount/"\" \
${WARN_CFLAGS} \
$(MATE_APPLETS4_CFLAGS) \
+ $(MATE_DESKTOP_CFLAGS) \
$(NULL)
BUILT_SOURCES = \
@@ -28,13 +29,15 @@ 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)
+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_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)
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)