diff options
| -rw-r--r-- | applets/brightness/brightness-applet.c | 25 | ||||
| -rw-r--r-- | applets/inhibit/inhibit-applet.c | 25 | ||||
| -rw-r--r-- | configure.ac | 6 |
3 files changed, 26 insertions, 30 deletions
diff --git a/applets/brightness/brightness-applet.c b/applets/brightness/brightness-applet.c index 154101a..4336c29 100644 --- a/applets/brightness/brightness-applet.c +++ b/applets/brightness/brightness-applet.c @@ -37,7 +37,6 @@ #include <gdk/gdkkeysyms.h> #include <glib-object.h> #include <dbus/dbus-glib.h> -#include <libmate-desktop/mate-aboutdialog.h> #include "egg-debug.h" #include "gpm-common.h" @@ -905,7 +904,7 @@ gpm_applet_stop_scroll_events_cb (GtkWidget *widget, GdkEvent *event) static void gpm_applet_dialog_about_cb (GtkAction *action, gpointer data) { - MateAboutDialog *about; + GtkAboutDialog *about; GdkPixbuf *logo = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), @@ -941,17 +940,17 @@ gpm_applet_dialog_about_cb (GtkAction *action, gpointer data) license_trans = g_strconcat (_(license[0]), "\n\n", _(license[1]), "\n\n", _(license[2]), "\n\n", _(license[3]), "\n", NULL); - about = (MateAboutDialog*) mate_about_dialog_new (); - mate_about_dialog_set_program_name (about, GPM_BRIGHTNESS_APPLET_NAME); - mate_about_dialog_set_version (about, VERSION); - mate_about_dialog_set_copyright (about, _("Copyright \xc2\xa9 2006 Benjamin Canou")); - mate_about_dialog_set_comments (about, GPM_BRIGHTNESS_APPLET_DESC); - mate_about_dialog_set_authors (about, authors); - mate_about_dialog_set_documenters (about, documenters); - mate_about_dialog_set_translator_credits (about, translator_credits); - mate_about_dialog_set_logo (about, logo); - mate_about_dialog_set_license (about, license_trans); - mate_about_dialog_set_website (about, "http://www.mate-desktop.org/"); + about = (GtkAboutDialog*) gtk_about_dialog_new (); + gtk_about_dialog_set_program_name (about, GPM_BRIGHTNESS_APPLET_NAME); + gtk_about_dialog_set_version (about, VERSION); + gtk_about_dialog_set_copyright (about, _("Copyright \xc2\xa9 2006 Benjamin Canou")); + gtk_about_dialog_set_comments (about, GPM_BRIGHTNESS_APPLET_DESC); + gtk_about_dialog_set_authors (about, authors); + gtk_about_dialog_set_documenters (about, documenters); + gtk_about_dialog_set_translator_credits (about, translator_credits); + gtk_about_dialog_set_logo (about, logo); + gtk_about_dialog_set_license (about, license_trans); + gtk_about_dialog_set_website (about, "http://www.mate-desktop.org/"); g_signal_connect (G_OBJECT(about), "response", G_CALLBACK(gtk_widget_destroy), NULL); diff --git a/applets/inhibit/inhibit-applet.c b/applets/inhibit/inhibit-applet.c index 7a59152..dad16a7 100644 --- a/applets/inhibit/inhibit-applet.c +++ b/applets/inhibit/inhibit-applet.c @@ -36,7 +36,6 @@ #include <glib-object.h> #include <glib/gi18n.h> #include <dbus/dbus-glib.h> -#include <libmate-desktop/mate-aboutdialog.h> #include "egg-debug.h" #include "gpm-common.h" @@ -427,7 +426,7 @@ gpm_applet_click_cb (GpmInhibitApplet *applet, GdkEventButton *event) static void gpm_applet_dialog_about_cb (GtkAction *action, gpointer data) { - MateAboutDialog *about; + GtkAboutDialog *about; GdkPixbuf *logo = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), @@ -463,17 +462,17 @@ gpm_applet_dialog_about_cb (GtkAction *action, gpointer data) license_trans = g_strconcat (_(license[0]), "\n\n", _(license[1]), "\n\n", _(license[2]), "\n\n", _(license[3]), "\n", NULL); - about = (MateAboutDialog*) mate_about_dialog_new (); - mate_about_dialog_set_program_name (about, GPM_INHIBIT_APPLET_NAME); - mate_about_dialog_set_version (about, VERSION); - mate_about_dialog_set_copyright (about, _("Copyright \xc2\xa9 2006-2007 Richard Hughes")); - mate_about_dialog_set_comments (about, GPM_INHIBIT_APPLET_DESC); - mate_about_dialog_set_authors (about, authors); - mate_about_dialog_set_documenters (about, documenters); - mate_about_dialog_set_translator_credits (about, translator_credits); - mate_about_dialog_set_logo (about, logo); - mate_about_dialog_set_license (about, license_trans); - mate_about_dialog_set_website (about, "http://www.mate-desktop.org/"); + about = (GtkAboutDialog*) gtk_about_dialog_new (); + gtk_about_dialog_set_program_name (about, GPM_INHIBIT_APPLET_NAME); + gtk_about_dialog_set_version (about, VERSION); + gtk_about_dialog_set_copyright (about, _("Copyright \xc2\xa9 2006-2007 Richard Hughes")); + gtk_about_dialog_set_comments (about, GPM_INHIBIT_APPLET_DESC); + gtk_about_dialog_set_authors (about, authors); + gtk_about_dialog_set_documenters (about, documenters); + gtk_about_dialog_set_translator_credits (about, translator_credits); + gtk_about_dialog_set_logo (about, logo); + gtk_about_dialog_set_license (about, license_trans); + gtk_about_dialog_set_website (about, "http://www.mate-desktop.org/"); g_signal_connect (G_OBJECT(about), "response", G_CALLBACK(gtk_widget_destroy), NULL); diff --git a/configure.ac b/configure.ac index 1c24b54..2f5a0b1 100644 --- a/configure.ac +++ b/configure.ac @@ -131,7 +131,6 @@ LIBPANEL_REQUIRED=1.5.0 XRANDR_REQUIRED=1.3.0 CANBERRA_REQUIRED=0.10 UPOWER_REQUIRED=0.9.5 -MATE_DESKTOP_REQUIRED=1.9.0 dnl ---------------------------------------------------------------------------- dnl GTK library version @@ -174,7 +173,7 @@ PKG_CHECK_MODULES(DBUS,[ dbus-1 >= $DBUS_REQUIRED gthread-2.0]) -PKG_CHECK_MODULES(MATE, [ +PKG_CHECK_MODULES(CAIRO, [ gtk+-$GTK_API_VERSION >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED]) @@ -283,8 +282,7 @@ have_applets=no if test x$enable_applets = xyes ; then have_applets=yes - PKG_CHECK_MODULES(PANEL, [libmatepanelapplet-4.0 >= $LIBPANEL_REQUIRED - mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED]) + PKG_CHECK_MODULES(PANEL, [libmatepanelapplet-4.0 >= $LIBPANEL_REQUIRED]) AC_DEFINE(HAVE_APPLETS, 1, [Define if we are building applets]) fi AC_MSG_RESULT([$have_applets]) |