diff options
Diffstat (limited to 'cpufreq')
| -rw-r--r-- | cpufreq/Makefile.am | 2 | ||||
| -rw-r--r-- | cpufreq/src/Makefile.am | 4 | ||||
| -rw-r--r-- | cpufreq/src/cpufreq-applet.c | 23 | ||||
| -rw-r--r-- | cpufreq/src/cpufreq-selector/main.c | 2 | ||||
| -rw-r--r-- | cpufreq/src/cpufreq-selector/org.mate.cpufreqselector.policy.in | 2 |
5 files changed, 7 insertions, 26 deletions
diff --git a/cpufreq/Makefile.am b/cpufreq/Makefile.am index 9e821585..ea9ea2aa 100644 --- a/cpufreq/Makefile.am +++ b/cpufreq/Makefile.am @@ -30,7 +30,7 @@ org.mate.panel.applet.CPUFreqAppletFactory.service: $(service_in_files) builder_DATA = cpufreq-preferences.ui -uidir = $(datadir)/mate-2.0/ui +uidir = $(datadir)/mate/ui ui_DATA = cpufreq-applet-menu.xml CLEANFILES = \ diff --git a/cpufreq/src/Makefile.am b/cpufreq/src/Makefile.am index a30d3513..9d0a1140 100644 --- a/cpufreq/src/Makefile.am +++ b/cpufreq/src/Makefile.am @@ -5,8 +5,9 @@ endif SUBDIRS = $(selector_SUBDIR) AM_CPPFLAGS = \ - -DCPUFREQ_MENU_UI_DIR=\""$(datadir)/mate-2.0/ui"\" \ + -DCPUFREQ_MENU_UI_DIR=\""$(datadir)/mate/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..a053da5a 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> @@ -98,11 +99,7 @@ static void cpufreq_applet_update (CPUFreqApplet *applet, CPUFreqMonitor *monitor); static void cpufreq_applet_refresh (CPUFreqApplet *applet); -#if GTK_CHECK_VERSION (3, 0, 0) static void cpufreq_applet_dispose (GObject *widget); -#else -static void cpufreq_applet_destroy (GtkObject *widget); -#endif static gboolean cpufreq_applet_button_press (GtkWidget *widget, GdkEventButton *event); static gboolean cpufreq_applet_key_press (GtkWidget *widget, @@ -227,18 +224,10 @@ static void cpufreq_applet_class_init (CPUFreqAppletClass *klass) { MatePanelAppletClass *applet_class = MATE_PANEL_APPLET_CLASS (klass); -#if GTK_CHECK_VERSION (3, 0, 0) GObjectClass *gobject_class = G_OBJECT_CLASS (klass); -#else - GtkObjectClass *gtkobject_class = GTK_OBJECT_CLASS (klass); -#endif GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); -#if GTK_CHECK_VERSION (3, 0, 0) gobject_class->dispose = cpufreq_applet_dispose; -#else - gtkobject_class->destroy = cpufreq_applet_destroy; -#endif widget_class->size_allocate = cpufreq_applet_size_allocate; #if GTK_CHECK_VERSION (3, 0, 0) @@ -253,11 +242,7 @@ cpufreq_applet_class_init (CPUFreqAppletClass *klass) } static void -#if GTK_CHECK_VERSION (3, 0, 0) cpufreq_applet_dispose (GObject *widget) -#else -cpufreq_applet_destroy (GtkObject *widget) -#endif { CPUFreqApplet *applet; gint i; @@ -286,11 +271,7 @@ cpufreq_applet_destroy (GtkObject *widget) applet->popup = NULL; } -#if GTK_CHECK_VERSION (3, 0, 0) G_OBJECT_CLASS (cpufreq_applet_parent_class)->dispose (widget); -#else - GTK_OBJECT_CLASS (cpufreq_applet_parent_class)->destroy (widget); -#endif } static void @@ -686,7 +667,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/cpufreq/src/cpufreq-selector/main.c b/cpufreq/src/cpufreq-selector/main.c index 44518c3e..37734172 100644 --- a/cpufreq/src/cpufreq-selector/main.c +++ b/cpufreq/src/cpufreq-selector/main.c @@ -183,8 +183,6 @@ main (gint argc, gchar **argv) } #endif - g_type_init (); - context = g_option_context_new ("- CPUFreq Selector"); g_option_context_add_main_entries (context, options, NULL); diff --git a/cpufreq/src/cpufreq-selector/org.mate.cpufreqselector.policy.in b/cpufreq/src/cpufreq-selector/org.mate.cpufreqselector.policy.in index f1249cd2..6864e82b 100644 --- a/cpufreq/src/cpufreq-selector/org.mate.cpufreqselector.policy.in +++ b/cpufreq/src/cpufreq-selector/org.mate.cpufreqselector.policy.in @@ -7,7 +7,7 @@ <policyconfig> <vendor>The MATE Project</vendor> - <vendor_url>http://www.mate.org/</vendor_url> + <vendor_url>http://www.mate-desktop.org</vendor_url> <icon_name>mate-cpu-frequency-applet</icon_name> <action id="org.mate.cpufreqselector"> |