9 files changed, 24 insertions, 11 deletions
diff --git a/applets/clock/clock.c b/applets/clock/clock.c
index ef35eff4..4592698e 100644
--- a/applets/clock/clock.c
+++ b/applets/clock/clock.c
@@ -52,6 +52,8 @@
 #include <gdk/gdkx.h>
 #include <gio/gio.h>
 
+#include <libmate-desktop/mate-aboutdialog.h>
+
 #include <libmateweather/mateweather-prefs.h>
 #include <libmateweather/mateweather-xml.h>
 #include <libmateweather/location-entry.h>
@@ -3228,7 +3230,7 @@ static void display_about_dialog(GtkAction* action, ClockData* cd)
 char copyright[] = \
 "Copyright \xc2\xa9 1998-2004 Free Software Foundation, Inc.";
 
- gtk_show_about_dialog(NULL,
+ mate_show_about_dialog(NULL,
 "program-name", _("Clock"),
 "authors", authors,
 "comments", _("The Clock displays the current time and date"),
diff --git a/applets/fish/fish.c b/applets/fish/fish.c
index 114aaa4f..c4a91d88 100644
--- a/applets/fish/fish.c
+++ b/applets/fish/fish.c
@@ -42,6 +42,7 @@
 #include <gdk/gdkkeysyms-compat.h>
 #endif
 #include <gio/gio.h>
+#include <libmate-desktop/mate-aboutdialog.h>
 
 #include <mate-panel-applet.h>
 #include <mate-panel-applet-gsettings.h>
@@ -571,7 +572,7 @@ static void display_about_dialog(GtkAction* action, FishApplet* fish)
 
 descr = g_strdup_printf(about_format, fish->name);
 
- gtk_show_about_dialog(NULL,
+ mate_show_about_dialog(NULL,
 "program-name", _("Fish"),
 "authors", authors,
 "comments", descr,
diff --git a/applets/notification_area/main.c b/applets/notification_area/main.c
index 81203bac..71b9b2e5 100644
--- a/applets/notification_area/main.c
+++ b/applets/notification_area/main.c
@@ -29,6 +29,8 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
+#include <libmate-desktop/mate-aboutdialog.h>
+
 #include "na-tray-manager.h"
 #include "na-tray.h"
 #include "fixedtip.h"
@@ -120,7 +122,7 @@ static void about_cb(GtkAction* action, AppletData* data)
 "Copyright \xc2\xa9 2003-2006 Vincent Untz\n"
 "Copyright \xc2\xa9 2011 Perberos";
 
- gtk_show_about_dialog(NULL,
+ mate_show_about_dialog(NULL,
 "program-name", _("Notification Area"),
 "authors", authors,
 //"comments", _(comments),
diff --git a/applets/wncklet/showdesktop.c b/applets/wncklet/showdesktop.c
index abee22bc..efe19ab2 100644
--- a/applets/wncklet/showdesktop.c
+++ b/applets/wncklet/showdesktop.c
@@ -33,6 +33,8 @@
 #define WNCK_I_KNOW_THIS_IS_UNSTABLE
 #include <libwnck/libwnck.h>
 
+#include <libmate-desktop/mate-aboutdialog.h>
+
 #include "wncklet.h"
 #include "showdesktop.h"
 
@@ -479,7 +481,7 @@ static void display_about_dialog(GtkAction* action, ShowDesktopData* sdd)
 "Copyright \xc2\xa9 2011 Perberos\n"
 "Copyright \xc2\xa9 2002 Red Hat, Inc.";
 
- gtk_show_about_dialog(GTK_WINDOW(sdd->applet),
+ mate_show_about_dialog(GTK_WINDOW(sdd->applet),
 "program-name", _("Show Desktop Button"),
 "authors", authors,
 "comments", _("This button lets you hide all windows and show the desktop."),
diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c
index 721aef22..954fb577 100644
--- a/applets/wncklet/window-list.c
+++ b/applets/wncklet/window-list.c
@@ -23,6 +23,7 @@
 #include <libwnck/libwnck.h>
 #include <gio/gio.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>
@@ -579,7 +580,7 @@ static void display_about_dialog(GtkAction* action, TasklistData* tasklist)
 "Copyright \xc2\xa9 2011 Perberos\n"
 "Copyright \xc2\xa9 2002 Red Hat, Inc.";
 
- gtk_show_about_dialog(GTK_WINDOW(tasklist->applet),
+ mate_show_about_dialog(GTK_WINDOW(tasklist->applet),
 "program-name", _("Window List"),
 "authors", authors,
 "comments", _("The Window List shows a list of all windows in a set of buttons and lets you browse them."),
diff --git a/applets/wncklet/window-menu.c b/applets/wncklet/window-menu.c
index 86701b96..76dfdc58 100644
--- a/applets/wncklet/window-menu.c
+++ b/applets/wncklet/window-menu.c
@@ -38,6 +38,8 @@
 #include <gdk/gdkkeysyms-compat.h>
 #endif
 
+#include <libmate-desktop/mate-aboutdialog.h>
+
 #define WNCK_I_KNOW_THIS_IS_UNSTABLE
 #include <libwnck/libwnck.h>
 
@@ -81,7 +83,7 @@ static void window_menu_about(GtkAction* action, WindowMenu* window_menu)
 "Copyright \xc2\xa9 2001 Free Software Foundation, Inc.\n"
 "Copyright \xc2\xa9 2000 Helix Code, Inc.";
 
- gtk_show_about_dialog(GTK_WINDOW(window_menu->applet),
+ mate_show_about_dialog(GTK_WINDOW(window_menu->applet),
 "program-name", _("Window Selector"),
 "authors", authors,
 "comments", _("The Window Selector shows a list of all windows in a menu and lets you browse them."),
diff --git a/applets/wncklet/workspace-switcher.c b/applets/wncklet/workspace-switcher.c
index d35155a2..bf6e365d 100644
--- a/applets/wncklet/workspace-switcher.c
+++ b/applets/wncklet/workspace-switcher.c
@@ -25,6 +25,7 @@
 #include <libwnck/libwnck.h>
 #include <gio/gio.h>
 
+#include <libmate-desktop/mate-aboutdialog.h>
 #include <libmate-desktop/mate-gsettings.h>
 
 #include "workspace-switcher.h"
@@ -603,7 +604,7 @@ static void display_about_dialog(GtkAction* action, PagerData* pager)
 "Copyright \xc2\xa9 2011 Perberos\n"
 "Copyright \xc2\xa9 2002 Red Hat, Inc.";
 
- gtk_show_about_dialog(GTK_WINDOW(pager->applet),
+ mate_show_about_dialog(GTK_WINDOW(pager->applet),
 "program-name", _("Workspace Switcher"),
 "authors", authors,
 "comments", _("The Workspace Switcher shows you a small version of your workspaces that lets you manage your windows."),
diff --git a/configure.ac b/configure.ac
index 365a0e2d..708290e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,7 +56,7 @@ fi
 AC_CHECK_HEADERS(crt_externs.h)
 AC_CHECK_FUNCS(_NSGetEnviron)
 
-LIBMATE_DESKTOP_REQUIRED=1.5.0
+LIBMATE_DESKTOP_REQUIRED=1.9.0
 GDK_PIXBUF_REQUIRED=2.7.1
 PANGO_REQUIRED=1.15.4
 GLIB_REQUIRED=2.26
@@ -122,11 +122,11 @@ PKG_CHECK_MODULES(LIBMATE_PANEL_APPLET, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED g
 AC_SUBST(LIBMATE_PANEL_APPLET_CFLAGS)
 AC_SUBST(LIBMATE_PANEL_APPLET_LIBS)
 
-PKG_CHECK_MODULES(FISH, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED)
+PKG_CHECK_MODULES(FISH, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED mate-desktop-2.0 >= $LIBMATE_DESKTOP_REQUIRED)
 AC_SUBST(FISH_CFLAGS)
 AC_SUBST(FISH_LIBS)
 
-PKG_CHECK_MODULES(NOTIFICATION_AREA, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED)
+PKG_CHECK_MODULES(NOTIFICATION_AREA, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED mate-desktop-2.0 >= $LIBMATE_DESKTOP_REQUIRED)
 AC_SUBST(NOTIFICATION_AREA_CFLAGS)
 AC_SUBST(NOTIFICATION_AREA_LIBS)
 
diff --git a/mate-panel/panel-context-menu.c b/mate-panel/panel-context-menu.c
index 0ab6bf22..0e423bff 100644
--- a/mate-panel/panel-context-menu.c
+++ b/mate-panel/panel-context-menu.c
@@ -34,6 +34,8 @@
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 
+#include <libmate-desktop/mate-aboutdialog.h>
+
 #include <libpanel-util/panel-error.h>
 #include <libpanel-util/panel-show.h>
 
@@ -133,7 +135,7 @@ panel_context_menu_show_about_dialog (GtkWidget *menuitem)
 /* Note: we don't use gtk_show_about_dialog() since some applets can
 * be loaded in this process and we don't want to share the about
 * dialog */
- about = gtk_about_dialog_new ();
+ about = mate_about_dialog_new ();
 g_object_set (about,
 "program-name", _("The MATE Panel"),
 "version", VERSION,