5 files changed, 10 insertions, 20 deletions
diff --git a/geyes/Makefile.am b/geyes/Makefile.am
index 791d36fa..d23fa119 100644
--- a/geyes/Makefile.am
+++ b/geyes/Makefile.am
@@ -4,19 +4,21 @@ AM_CPPFLAGS = \
 -I. \
 -I$(srcdir) \
 $(MATE_APPLETS4_CFLAGS) \
+ $(MATEDESKTOP_CFLAGS) \
 -I$(includedir) \
 -DGEYES_THEMES_DIR=\""$(pkgdatadir)/geyes/"\" \
 -DGEYES_MENU_UI_DIR=\""$(uidir)"\"
 
-libexec_PROGRAMS = geyes_applet2
+libexec_PROGRAMS = geyes-applet
 
-geyes_applet2_SOURCES = \
+geyes_applet_SOURCES = \
 geyes.c \
 themes.c \
 geyes.h
 
-geyes_applet2_LDADD = \
+geyes_applet_LDADD = \
 $(MATE_APPLETS4_LIBS) \
+ $(MATEDESKTOP_LIBS) \
 -lm
 
 appletdir = $(datadir)/mate-panel/applets
@@ -40,7 +42,7 @@ org.mate.panel.applet.GeyesAppletFactory.service: $(service_in_files)
 -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
 $< > $@
 
-uidir = $(datadir)/mate-2.0/ui
+uidir = $(datadir)/mate/ui
 ui_DATA = geyes-applet-menu.xml
 
 @INTLTOOL_XML_NOMERGE_RULE@
diff --git a/geyes/geyes.c b/geyes/geyes.c
index 07c17256..161c1682 100644
--- a/geyes/geyes.c
+++ b/geyes/geyes.c
@@ -20,6 +20,7 @@
 #include <config.h>
 #include <math.h>
 #include <stdlib.h>
+#include <libmate-desktop/mate-aboutdialog.h>
 #include <mate-panel-applet.h>
 #include <mate-panel-applet-gsettings.h>
 #include "geyes.h"
@@ -191,7 +192,7 @@ about_cb (GtkAction *action,
 NULL
 };
 
- gtk_show_about_dialog (NULL,
+ mate_show_about_dialog (NULL,
 "version", VERSION,
 "comments", _("A goofy set of eyes for the MATE "
 "panel. They follow your mouse."),
@@ -303,11 +304,7 @@ create_eyes (MatePanelApplet *applet)
 }
 
 static void
-#if GTK_CHECK_VERSION (3, 0, 0)
 dispose_cb (GObject *object, EyesApplet *eyes_applet)
-#else
-destroy_cb (GtkObject *object, EyesApplet *eyes_applet)
-#endif
 {
 g_return_if_fail (eyes_applet);
 
@@ -445,13 +442,8 @@ geyes_applet_fill (MatePanelApplet *applet)
 G_CALLBACK (applet_back_change),
 eyes_applet);
 g_signal_connect (eyes_applet->vbox,
-#if GTK_CHECK_VERSION (3, 0, 0)
 "dispose",
 G_CALLBACK (dispose_cb),
-#else
- "destroy",
- G_CALLBACK (destroy_cb),
-#endif
 eyes_applet);
 
 gtk_widget_show_all (GTK_WIDGET (eyes_applet->applet));
diff --git a/geyes/org.mate.applets.GeyesApplet.mate-panel-applet.in.in b/geyes/org.mate.applets.GeyesApplet.mate-panel-applet.in.in
index d512ed20..d2080905 100644
--- a/geyes/org.mate.applets.GeyesApplet.mate-panel-applet.in.in
+++ b/geyes/org.mate.applets.GeyesApplet.mate-panel-applet.in.in
@@ -1,6 +1,6 @@
 [Applet Factory]
 Id=GeyesAppletFactory
-Location=@LIBEXECDIR@/geyes_applet2
+Location=@LIBEXECDIR@/geyes-applet
 _Name=Geyes Applet Factory
 _Description=Geyes Applet Factory
 
diff --git a/geyes/org.mate.panel.applet.GeyesAppletFactory.service.in b/geyes/org.mate.panel.applet.GeyesAppletFactory.service.in
index 783f42b4..f1363812 100644
--- a/geyes/org.mate.panel.applet.GeyesAppletFactory.service.in
+++ b/geyes/org.mate.panel.applet.GeyesAppletFactory.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.mate.panel.applet.GeyesAppletFactory
-Exec=@LIBEXECDIR@/geyes_applet2
+Exec=@LIBEXECDIR@/geyes-applet
diff --git a/geyes/themes.c b/geyes/themes.c
index f7df773b..9af46d4b 100644
--- a/geyes/themes.c
+++ b/geyes/themes.c
@@ -46,11 +46,7 @@ void theme_dirs_create (void)
 
 theme_directories[0] = g_build_filename(GEYES_THEMES_DIR, NULL);
 
- #if GLIB_CHECK_VERSION(2, 6, 0)
 theme_directories[1] = g_build_filename(g_get_user_config_dir(), "mate", "geyes-themes", NULL);
- #else // glib version < 2.6.0
- theme_directories[1] = g_build_filename(g_get_home_dir(), ".config", "mate", "geyes-themes", NULL);
- #endif
 
 themes_created = TRUE;
 }