summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--accessx-status/applet.c3
-rw-r--r--battstat/Makefile.am2
-rw-r--r--battstat/battstat_applet.c4
-rw-r--r--charpick/Makefile.am2
-rw-r--r--charpick/charpick.c3
-rw-r--r--command/Makefile.am3
-rw-r--r--command/command.c3
-rw-r--r--configure.ac2
-rw-r--r--cpufreq/src/Makefile.am2
-rw-r--r--cpufreq/src/cpufreq-applet.c3
-rw-r--r--drivemount/Makefile.am6
-rw-r--r--drivemount/drivemount.c3
-rw-r--r--geyes/Makefile.am2
-rw-r--r--geyes/geyes.c3
-rw-r--r--mateweather/Makefile.am2
-rw-r--r--mateweather/mateweather-about.c4
-rw-r--r--multiload/main.c3
-rw-r--r--stickynotes/Makefile.am2
-rw-r--r--stickynotes/stickynotes_applet_callbacks.c3
-rw-r--r--timerapplet/Makefile.am3
-rw-r--r--timerapplet/timerapplet.c3
-rw-r--r--trashapplet/src/Makefile.am2
-rw-r--r--trashapplet/src/trashapplet.c3
23 files changed, 49 insertions, 17 deletions
diff --git a/accessx-status/applet.c b/accessx-status/applet.c
index e97acb0b..bdea685d 100644
--- a/accessx-status/applet.c
+++ b/accessx-status/applet.c
@@ -39,6 +39,7 @@
#include <X11/keysymdef.h>
#include "applet.h"
+#include <libmate-desktop/mate-aboutdialog.h>
#if GTK_CHECK_VERSION (3, 0, 0)
#define MATE_DESKTOP_USE_UNSTABLE_API
#include <libmate-desktop/mate-desktop-utils.h>
@@ -140,7 +141,7 @@ static void about_cb(GtkAction* action, AccessxStatusApplet* sapplet)
NULL
};
- gtk_show_about_dialog(NULL,
+ mate_show_about_dialog(NULL,
"version", VERSION,
"comments", _("Shows the state of AccessX features such as latched modifiers"),
"copyright", "\xC2\xA9 2003 Sun Microsystems",
diff --git a/battstat/Makefile.am b/battstat/Makefile.am
index 4985f251..fec3e882 100644
--- a/battstat/Makefile.am
+++ b/battstat/Makefile.am
@@ -25,6 +25,7 @@ DIST_SUBDIRS = docs sounds apmlib
AM_CPPFLAGS = \
$(MATE_APPLETS4_CFLAGS) \
+ $(MATEDESKTOP_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
$(HAL_CFLAGS) \
$(UPOWER_CFLAGS) \
@@ -55,6 +56,7 @@ battstat_applet_2_SOURCES = \
battstat_applet_2_LDADD = \
$(MATE_APPLETS4_LIBS) \
+ $(MATEDESKTOP_LIBS) \
$(LIBNOTIFY_LIBS) \
$(HAL_LIBS) \
$(APMLIB) \
diff --git a/battstat/battstat_applet.c b/battstat/battstat_applet.c
index 9de1ff7c..5ecac451 100644
--- a/battstat/battstat_applet.c
+++ b/battstat/battstat_applet.c
@@ -44,6 +44,8 @@
#include <libnotify/notify.h>
#endif
+#include <libmate-desktop/mate-aboutdialog.h>
+
#include "battstat.h"
#include "pixmaps.h"
@@ -1420,7 +1422,7 @@ about_cb( GtkAction *action, ProgressData *battstat )
/* true */ _("HAL backend enabled.") :
/* false */ _("Legacy (non-HAL) backend enabled.")));
- gtk_show_about_dialog( NULL,
+ mate_show_about_dialog( NULL,
"version", VERSION,
"copyright", "\xC2\xA9 2000 The Gnulix Society, "
"\xC2\xA9 2002-2005 Free Software Foundation and "
diff --git a/charpick/Makefile.am b/charpick/Makefile.am
index b4c7d1d4..c2608e8e 100644
--- a/charpick/Makefile.am
+++ b/charpick/Makefile.am
@@ -5,6 +5,7 @@ AM_CPPFLAGS = \
-I$(srcdir) \
-DCHARPICK_MENU_UI_DIR=\""$(uidir)"\" \
$(MATE_APPLETS4_CFLAGS) \
+ $(MATEDESKTOP_CFLAGS) \
$(GUCHARMAP_CFLAGS)
libexec_PROGRAMS = charpick_applet2
@@ -15,6 +16,7 @@ charpick_applet2_SOURCES = charpick.c \
charpick_applet2_LDADD = \
$(MATE_APPLETS4_LIBS) \
+ $(MATEDESKTOP_LIBS) \
$(GUCHARMAP_LIBS)
appletdir = $(datadir)/mate-panel/applets
diff --git a/charpick/charpick.c b/charpick/charpick.c
index 861c29a8..7641e468 100644
--- a/charpick/charpick.c
+++ b/charpick/charpick.c
@@ -9,6 +9,7 @@
#ifdef HAVE_GUCHARMAP
#include <gucharmap/gucharmap.h>
#endif
+#include <libmate-desktop/mate-aboutdialog.h>
#include "charpick.h"
#if GTK_CHECK_VERSION (3, 0, 0)
@@ -588,7 +589,7 @@ about (GtkAction *action,
NULL
};
- gtk_show_about_dialog (NULL,
+ mate_show_about_dialog (NULL,
"version", VERSION,
"copyright", "\xC2\xA9 1998, 2004-2005 GNOME Applets Maintainers "
"and others",
diff --git a/command/Makefile.am b/command/Makefile.am
index 42bcaa5e..e9df3c81 100644
--- a/command/Makefile.am
+++ b/command/Makefile.am
@@ -1,5 +1,6 @@
AM_CPPFLAGS = \
$(MATE_APPLETS4_CFLAGS) \
+ $(MATEDESKTOP_CFLAGS) \
-I$(srcdir) \
-DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
$(DISABLE_DEPRECATED_CFLAGS)
@@ -8,7 +9,7 @@ APPLET_LOCATION = $(libexecdir)/command-applet
libexec_PROGRAMS = command-applet
command_applet_SOURCES = command.c
-command_applet_LDADD = $(MATE_APPLETS4_LIBS)
+command_applet_LDADD = $(MATE_APPLETS4_LIBS) $(MATEDESKTOP_LIBS)
command_applet_CFLAGS = $(WARN_CFLAGS)
appletsdir = $(datadir)/mate-panel/applets
diff --git a/command/command.c b/command/command.c
index dc27ea62..e7113b65 100644
--- a/command/command.c
+++ b/command/command.c
@@ -27,6 +27,7 @@
#include <glib/gi18n.h>
#include <gio/gio.h>
#include <gtk/gtk.h>
+#include <libmate-desktop/mate-aboutdialog.h>
#include <mate-panel-applet.h>
#include <mate-panel-applet-gsettings.h>
@@ -103,7 +104,7 @@ command_about_callback (GtkAction *action, CommandApplet *command_applet)
{
const char* authors[] = { "Stefano Karapetsas <[email protected]>", NULL };
- gtk_show_about_dialog(NULL,
+ mate_show_about_dialog(NULL,
"version", VERSION,
"copyright", "Copyright © 2013-2014 Stefano Karapetsas",
"authors", authors,
diff --git a/configure.ac b/configure.ac
index cef1e23f..c32b9c9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ GIO_REQUIRED=2.15.3
LIBPANEL4_REQUIRED=1.7.0
LIBGTOP_REQUIRED=2.11.92
LIBXKLAVIER_REQUIRED=4.0
-LIBMATE_DESKTOP_REQUIRED=1.7.3
+LIBMATE_DESKTOP_REQUIRED=1.9.0
LIBNOTIFY_REQUIRED=0.7.0
HAL_REQUIRED=0.5.3
UPOWER_REQUIRED=0.9.4
diff --git a/cpufreq/src/Makefile.am b/cpufreq/src/Makefile.am
index a30d3513..0d7abefd 100644
--- a/cpufreq/src/Makefile.am
+++ b/cpufreq/src/Makefile.am
@@ -7,6 +7,7 @@ SUBDIRS = $(selector_SUBDIR)
AM_CPPFLAGS = \
-DCPUFREQ_MENU_UI_DIR=\""$(datadir)/mate-2.0/ui"\" \
$(MATE_APPLETS4_CFLAGS) \
+ $(MATEDESKTOP_CFLAGS) \
$(LIBGLADE_CFLAGS) \
$(DBUS_CFLAGS)
@@ -31,6 +32,7 @@ mate_cpufreq_applet_SOURCES = \
mate_cpufreq_applet_LDADD = \
$(MATE_APPLETS4_LIBS) \
+ $(MATEDESKTOP_LIBS) \
$(LIBGLADE_LIBS) \
$(LIBCPUFREQ_LIBS) \
$(DBUS_LIBS)
diff --git a/cpufreq/src/cpufreq-applet.c b/cpufreq/src/cpufreq-applet.c
index b066c919..aaa4ae4e 100644
--- a/cpufreq/src/cpufreq-applet.c
+++ b/cpufreq/src/cpufreq-applet.c
@@ -32,6 +32,7 @@
#include <mate-panel-applet.h>
#include <mate-panel-applet-gsettings.h>
#include <glib/gi18n.h>
+#include <libmate-desktop/mate-aboutdialog.h>
#include <stdlib.h>
#include <string.h>
@@ -686,7 +687,7 @@ cpufreq_applet_about_cb (GtkAction *action,
NULL
};
- gtk_show_about_dialog (NULL,
+ mate_show_about_dialog (NULL,
"version", VERSION,
"copyright", "\xC2\xA9 2004 Carlos Garcia Campos",
"comments", _("This utility shows the current CPU "
diff --git a/drivemount/Makefile.am b/drivemount/Makefile.am
index 46a6c195..ef482faf 100644
--- a/drivemount/Makefile.am
+++ b/drivemount/Makefile.am
@@ -4,7 +4,8 @@ AM_CPPFLAGS = \
-I. \
-I$(srcdir) \
-DDRIVEMOUNT_MENU_UI_DIR=\""$(uidir)"\" \
- $(MATE_APPLETS4_CFLAGS)
+ $(MATE_APPLETS4_CFLAGS) \
+ $(MATEDESKTOP_CFLAGS)
libexec_PROGRAMS = drivemount_applet2
@@ -16,7 +17,8 @@ drivemount_applet2_SOURCES = \
drive-button.h
drivemount_applet2_LDADD = \
- $(MATE_APPLETS4_LIBS)
+ $(MATE_APPLETS4_LIBS) \
+ $(MATEDESKTOP_LIBS)
appletdir = $(datadir)/mate-panel/applets
diff --git a/drivemount/drivemount.c b/drivemount/drivemount.c
index 60fa1457..90362970 100644
--- a/drivemount/drivemount.c
+++ b/drivemount/drivemount.c
@@ -28,6 +28,7 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
+#include <libmate-desktop/mate-aboutdialog.h>
#include <mate-panel-applet.h>
#include "drive-list.h"
@@ -112,7 +113,7 @@ display_about_dialog (GtkAction *action,
NULL
};
- gtk_show_about_dialog (NULL,
+ mate_show_about_dialog (NULL,
"version", VERSION,
"copyright", "Copyright \xC2\xA9 2004 Canonical Ltd",
"comments", _("Applet for mounting and unmounting block volumes."),
diff --git a/geyes/Makefile.am b/geyes/Makefile.am
index 791d36fa..ba9750c8 100644
--- a/geyes/Makefile.am
+++ b/geyes/Makefile.am
@@ -4,6 +4,7 @@ AM_CPPFLAGS = \
-I. \
-I$(srcdir) \
$(MATE_APPLETS4_CFLAGS) \
+ $(MATEDESKTOP_CFLAGS) \
-I$(includedir) \
-DGEYES_THEMES_DIR=\""$(pkgdatadir)/geyes/"\" \
-DGEYES_MENU_UI_DIR=\""$(uidir)"\"
@@ -17,6 +18,7 @@ geyes_applet2_SOURCES = \
geyes_applet2_LDADD = \
$(MATE_APPLETS4_LIBS) \
+ $(MATEDESKTOP_LIBS) \
-lm
appletdir = $(datadir)/mate-panel/applets
diff --git a/geyes/geyes.c b/geyes/geyes.c
index 07c17256..f0bcd5c8 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."),
diff --git a/mateweather/Makefile.am b/mateweather/Makefile.am
index 9b0e27c0..d94173d2 100644
--- a/mateweather/Makefile.am
+++ b/mateweather/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-DMATEWEATHER_MENU_UI_DIR=\""$(uidir)"\" \
$(MATE_APPLETS4_CFLAGS) \
+ $(MATEDESKTOP_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
$(LIBMATEWEATHER_CFLAGS) \
$(NETWORKMANAGER_CFLAGS) \
@@ -25,6 +26,7 @@ mateweather_applet_2_SOURCES = \
mateweather_applet_2_LDADD = \
$(LIBNOTIFY_LIBS) \
$(MATE_APPLETS4_LIBS) \
+ $(MATEDESKTOP_LIBS) \
$(MATE_LIBS2_LIBS) \
$(LIBMATEWEATHER_LIBS) \
$(NETWORKMANAGER_LIBS) \
diff --git a/mateweather/mateweather-about.c b/mateweather/mateweather-about.c
index 424260f7..2fb72b34 100644
--- a/mateweather/mateweather-about.c
+++ b/mateweather/mateweather-about.c
@@ -18,6 +18,8 @@
#include <stdlib.h>
#include <assert.h>
+#include <libmate-desktop/mate-aboutdialog.h>
+
#define MATEWEATHER_I_KNOW_THIS_IS_UNSTABLE
#include "mateweather.h"
@@ -43,7 +45,7 @@ void mateweather_about_run(MateWeatherApplet* gw_applet)
NULL
};
- gtk_show_about_dialog(NULL,
+ mate_show_about_dialog(NULL,
"version", VERSION,
"copyright", _("\xC2\xA9 1999-2005 by S. Papadimitriou and others"),
"comments", _("A panel application for monitoring local weather conditions."),
diff --git a/multiload/main.c b/multiload/main.c
index 6efa2e31..b8e065bb 100644
--- a/multiload/main.c
+++ b/multiload/main.c
@@ -30,6 +30,7 @@
#include <mate-panel-applet.h>
#include <mate-panel-applet-gsettings.h>
+#include <libmate-desktop/mate-aboutdialog.h>
#if GTK_CHECK_VERSION (3, 0, 0)
#define MATE_DESKTOP_USE_UNSTABLE_API
#include <libmate-desktop/mate-desktop-utils.h>
@@ -58,7 +59,7 @@ about_cb (GtkAction *action,
NULL
};
- gtk_show_about_dialog (NULL,
+ mate_show_about_dialog (NULL,
"version", VERSION,
"copyright", "\xC2\xA9 1999-2005 Free Software Foundation "
"and others",
diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am
index df6f8292..c483ad38 100644
--- a/stickynotes/Makefile.am
+++ b/stickynotes/Makefile.am
@@ -14,6 +14,7 @@ AM_CPPFLAGS = \
-I$(srcdir) \
$(STICKYNOTES_CFLAGS) \
$(MATE_APPLETS4_CFLAGS) \
+ $(MATEDESKTOP_CFLAGS) \
$(LIBWNCK_CFLAGS) \
$(XML2_CFLAGS) \
-DSTICKYNOTES_MENU_UI_DIR=\""$(uidir)"\"\
@@ -36,6 +37,7 @@ stickynotes_applet_SOURCES = \
stickynotes_applet_LDADD = \
$(STICKYNOTES_LIBS) \
$(MATE_APPLETS4_LIBS) \
+ $(MATEDESKTOP_LIBS) \
$(LIBWNCK_LIBS) \
$(XML2_LIBS) \
-lX11
diff --git a/stickynotes/stickynotes_applet_callbacks.c b/stickynotes/stickynotes_applet_callbacks.c
index 980b9a10..6efece25 100644
--- a/stickynotes/stickynotes_applet_callbacks.c
+++ b/stickynotes/stickynotes_applet_callbacks.c
@@ -27,6 +27,7 @@
#endif
#include <X11/Xatom.h>
#include <gdk/gdkx.h>
+#include <libmate-desktop/mate-aboutdialog.h>
static gboolean get_desktop_window (Window *window)
{
@@ -432,7 +433,7 @@ menu_about_cb (GtkAction *action,
NULL
};
- gtk_show_about_dialog (NULL,
+ mate_show_about_dialog (NULL,
"version", VERSION,
"copyright", "\xC2\xA9 2002-2003 Loban A Rahman, "
"\xC2\xA9 2005 Davyd Madeley",
diff --git a/timerapplet/Makefile.am b/timerapplet/Makefile.am
index 01517ff8..5ace281b 100644
--- a/timerapplet/Makefile.am
+++ b/timerapplet/Makefile.am
@@ -1,5 +1,6 @@
AM_CPPFLAGS = \
$(MATE_APPLETS4_CFLAGS) \
+ $(MATEDESKTOP_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
-I$(srcdir) \
-DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@@ -9,7 +10,7 @@ APPLET_LOCATION = $(libexecdir)/timer-applet
libexec_PROGRAMS = timer-applet
timer_applet_SOURCES = timerapplet.c
-timer_applet_LDADD = $(MATE_APPLETS4_LIBS) $(LIBNOTIFY_LIBS)
+timer_applet_LDADD = $(MATE_APPLETS4_LIBS) $(MATEDESKTOP_LIBS) $(LIBNOTIFY_LIBS)
timer_applet_CFLAGS = $(WARN_CFLAGS)
appletsdir = $(datadir)/mate-panel/applets
diff --git a/timerapplet/timerapplet.c b/timerapplet/timerapplet.c
index 05857f74..04596139 100644
--- a/timerapplet/timerapplet.c
+++ b/timerapplet/timerapplet.c
@@ -29,6 +29,7 @@
#include <gtk/gtk.h>
#include <libnotify/notify.h>
+#include <libmate-desktop/mate-aboutdialog.h>
#include <mate-panel-applet.h>
#include <mate-panel-applet-gsettings.h>
@@ -246,7 +247,7 @@ timer_about_callback (GtkAction *action, TimerApplet *applet)
{
const char* authors[] = { "Stefano Karapetsas <[email protected]>", NULL };
- gtk_show_about_dialog(NULL,
+ mate_show_about_dialog(NULL,
"version", VERSION,
"copyright", "Copyright © 2014 Stefano Karapetsas",
"authors", authors,
diff --git a/trashapplet/src/Makefile.am b/trashapplet/src/Makefile.am
index 6e34f837..ebdfbe9f 100644
--- a/trashapplet/src/Makefile.am
+++ b/trashapplet/src/Makefile.am
@@ -1,5 +1,6 @@
AM_CPPFLAGS = -I$(top_srcdir) \
$(MATE_APPLETS4_CFLAGS) \
+ $(MATEDESKTOP_CFLAGS) \
$(GIO_CFLAGS) \
-DTRASH_MENU_UI_DIR=\""$(datadir)/mate-2.0/ui"\"
@@ -14,6 +15,7 @@ trashapplet_SOURCES = \
trashapplet_LDADD = \
$(MATE_APPLETS4_LIBS) \
+ $(MATEDESKTOP_LIBS) \
$(GIO_LIBS) \
-lX11
diff --git a/trashapplet/src/trashapplet.c b/trashapplet/src/trashapplet.c
index 53b657d6..709e9d3b 100644
--- a/trashapplet/src/trashapplet.c
+++ b/trashapplet/src/trashapplet.c
@@ -34,6 +34,7 @@
#include <gdk/gdkkeysyms-compat.h>
#endif
#include <gio/gio.h>
+#include <libmate-desktop/mate-aboutdialog.h>
#include <mate-panel-applet.h>
#include "trash-empty.h"
@@ -434,7 +435,7 @@ trash_applet_show_about (GtkAction *action,
NULL
};
- gtk_show_about_dialog (NULL,
+ mate_show_about_dialog (NULL,
"version", VERSION,
"copyright", "Copyright \xC2\xA9 2004 Michiel Sikkes,"
"\xC2\xA9 2008 Ryan Lortie",
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-01 23:53:00 +0000