9 files changed, 69 insertions, 48 deletions
diff --git a/cpufreq/src/Makefile.am b/cpufreq/src/Makefile.am
index e7b42722..e02b612d 100644
--- a/cpufreq/src/Makefile.am
+++ b/cpufreq/src/Makefile.am
@@ -6,51 +6,78 @@ SUBDIRS = $(selector_SUBDIR)
 
 AM_CPPFLAGS = \
 -DCPUFREQ_RESOURCE_PATH=\""/org/mate/mate-applets/cpufreq/"\" \
- $(MATE_APPLETS4_CFLAGS)
+ $(NULL)
 
-libexec_PROGRAMS = mate-cpufreq-applet
-
-BUILT_SOURCES = \
- cpufreq-resources.c cpufreq-resources.h
-
-nodist_mate_cpufreq_applet_SOURCES = \
- $(BUILT_SOURCES)
+AM_CFLAGS = \
+ $(MATE_APPLETS4_CFLAGS) \
+ $(GIO_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(NULL)
 
-mate_cpufreq_applet_SOURCES = \
- cpufreq-applet.c cpufreq-applet.h \
- cpufreq-utils.c cpufreq-utils.h \
- cpufreq-prefs.c cpufreq-prefs.h \
- cpufreq-selector.c cpufreq-selector.h \
- cpufreq-popup.c cpufreq-popup.h \
- cpufreq-monitor.c cpufreq-monitor.h \
- cpufreq-monitor-factory.c cpufreq-monitor-factory.h
+BUILT_SOURCES = \
+ cpufreq-resources.c \
+ cpufreq-resources.h \
+ $(NULL)
+APPLET_SOURCES = \
+ cpufreq-applet.c \
+ cpufreq-applet.h \
+ cpufreq-utils.c \
+ cpufreq-utils.h \
+ cpufreq-prefs.c \
+ cpufreq-prefs.h \
+ cpufreq-selector.c \
+ cpufreq-selector.h \
+ cpufreq-popup.c \
+ cpufreq-popup.h \
+ cpufreq-monitor.c \
+ cpufreq-monitor.h \
+ cpufreq-monitor-factory.c \
+ cpufreq-monitor-factory.h \
+ $(NULL)
 
 if HAVE_LIBCPUFREQ
-mate_cpufreq_applet_SOURCES += \
- cpufreq-monitor-libcpufreq.c \
- cpufreq-monitor-libcpufreq.h
+APPLET_SOURCES += \
+ cpufreq-monitor-libcpufreq.c \
+ cpufreq-monitor-libcpufreq.h \
+ $(NULL)
 else
-mate_cpufreq_applet_SOURCES += \
- cpufreq-monitor-cpuinfo.c \
- cpufreq-monitor-cpuinfo.h \
- cpufreq-monitor-sysfs.c \
- cpufreq-monitor-sysfs.h
+APPLET_SOURCES += \
+ cpufreq-monitor-cpuinfo.c \
+ cpufreq-monitor-cpuinfo.h \
+ cpufreq-monitor-sysfs.c \
+ cpufreq-monitor-sysfs.h \
+ $(NULL)
 endif
 
-mate_cpufreq_applet_CFLAGS = \
- ${WARN_CFLAGS}
+APPLET_LIBS = \
+ $(MATE_APPLETS4_LIBS) \
+ $(LIBCPUFREQ_LIBS) \
+ $(NULL)
 
-mate_cpufreq_applet_LDADD = \
- $(MATE_APPLETS4_LIBS) \
- $(LIBCPUFREQ_LIBS)
 
-cpufreq-resources.c: $(top_srcdir)/cpufreq/cpufreq-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(top_srcdir)/cpufreq --generate-dependencies $(top_srcdir)/cpufreq/cpufreq-resources.gresource.xml)
- $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(top_srcdir)/cpufreq --generate --c-name cpufreq $<
+if ENABLE_IN_PROCESS
+pkglib_LTLIBRARIES = libmate-cpufreq-applet.la
+nodist_libmate_cpufreq_applet_la_SOURCES = $(BUILT_SOURCES)
+libmate_cpufreq_applet_la_SOURCES = $(APPLET_SOURCES)
+libmate_cpufreq_applet_la_CFLAGS = $(AM_CFLAGS)
+libmate_cpufreq_applet_la_LDFLAGS = -module -avoid-version
+libmate_cpufreq_applet_la_LIBADD = $(APPLET_LIBS)
+else !ENABLE_IN_PROCESS
+libexec_PROGRAMS = mate-cpufreq-applet
+nodist_mate_cpufreq_applet_SOURCES = $(BUILT_SOURCES)
+mate_cpufreq_applet_SOURCES = $(APPLET_SOURCES)
+mate_cpufreq_applet_CFLAGS = $(AM_CFLAGS)
+mate_cpufreq_applet_LDADD = $(APPLET_LIBS)
+endif !ENABLE_IN_PROCESS
+
+cpufreq-resources.c: $(top_srcdir)/cpufreq/data/cpufreq-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(top_srcdir)/cpufreq/data --generate-dependencies $(top_srcdir)/cpufreq/data/cpufreq-resources.gresource.xml)
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(top_srcdir)/cpufreq/data --generate --c-name cpufreq $<
 
-cpufreq-resources.h: $(top_srcdir)/cpufreq/cpufreq-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(top_srcdir)/cpufreq --generate-dependencies $(top_srcdir)/cpufreq/cpufreq-resources.gresource.xml)
- $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(top_srcdir)/cpufreq --generate --c-name cpufreq $<
+cpufreq-resources.h: $(top_srcdir)/cpufreq/data/cpufreq-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(top_srcdir)/cpufreq/data --generate-dependencies $(top_srcdir)/cpufreq/data/cpufreq-resources.gresource.xml)
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(top_srcdir)/cpufreq/data --generate --c-name cpufreq $<
 
 CLEANFILES = \
- $(BUILT_SOURCES)
+ $(BUILT_SOURCES) \
+ $(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/cpufreq/src/cpufreq-applet.c b/cpufreq/src/cpufreq-applet.c
index adbd0e8c..b1509eaa 100644
--- a/cpufreq/src/cpufreq-applet.c
+++ b/cpufreq/src/cpufreq-applet.c
@@ -376,7 +376,7 @@ cpufreq_applet_key_press (GtkWidget *widget,
 break;
 }
 
- return FALSE;
+ return GTK_WIDGET_CLASS (cpufreq_applet_parent_class)->key_press_event (widget, event);
 }
 
 static void
@@ -720,7 +720,6 @@ cpufreq_applet_refresh (CPUFreqApplet *applet)
 horizontal = ((applet->orient == MATE_PANEL_APPLET_ORIENT_UP) ||
 (applet->orient == MATE_PANEL_APPLET_ORIENT_DOWN));
 
-
 /* We want a fixed label size, the biggest */
 
 gtk_widget_get_preferred_width (GTK_WIDGET (applet->label), &label_size, NULL);
@@ -788,7 +787,9 @@ cpufreq_applet_setup (CPUFreqApplet *applet)
 AtkObject *atk_obj;
 GSettings *settings;
 
+#ifndef ENABLE_IN_PROCESS
 g_set_application_name (_("CPU Frequency Scaling Monitor"));
+#endif
 
 gtk_window_set_default_icon_name ("mate-cpu-frequency-applet");
 
@@ -868,8 +869,8 @@ cpufreq_applet_factory (CPUFreqApplet *applet,
 return retval;
 }
 
-MATE_PANEL_APPLET_OUT_PROCESS_FACTORY ("CPUFreqAppletFactory",
- CPUFREQ_TYPE_APPLET,
- "cpufreq-applet",
- (MatePanelAppletFactoryCallback) cpufreq_applet_factory,
- NULL)
+PANEL_APPLET_FACTORY ("CPUFreqAppletFactory",
+ CPUFREQ_TYPE_APPLET,
+ "cpufreq-applet",
+ (MatePanelAppletFactoryCallback) cpufreq_applet_factory,
+ NULL)
diff --git a/cpufreq/src/cpufreq-prefs.c b/cpufreq/src/cpufreq-prefs.c
index f0e60bf0..c767861e 100644
--- a/cpufreq/src/cpufreq-prefs.c
+++ b/cpufreq/src/cpufreq-prefs.c
@@ -68,7 +68,6 @@ static void cpufreq_prefs_get_property (GObject *object,
 
 static void cpufreq_prefs_dialog_update_sensitivity (CPUFreqPrefs *prefs);
 
-
 G_DEFINE_TYPE_WITH_PRIVATE (CPUFreqPrefs, cpufreq_prefs, G_TYPE_OBJECT)
 
 static void
diff --git a/cpufreq/src/cpufreq-selector.c b/cpufreq/src/cpufreq-selector.c
index e157369d..01fe59b5 100644
--- a/cpufreq/src/cpufreq-selector.c
+++ b/cpufreq/src/cpufreq-selector.c
@@ -118,7 +118,6 @@ cpufreq_selector_connect_to_system_bus (CPUFreqSelector *selector,
 return (selector->system_bus != NULL);
 }
 
-
 static gboolean
 cpufreq_selector_create_proxy (CPUFreqSelector *selector,
 GError **error)
diff --git a/cpufreq/src/cpufreq-selector/cpufreq-selector-libcpufreq.h b/cpufreq/src/cpufreq-selector/cpufreq-selector-libcpufreq.h
index 90127579..c15c875f 100644
--- a/cpufreq/src/cpufreq-selector/cpufreq-selector-libcpufreq.h
+++ b/cpufreq/src/cpufreq-selector/cpufreq-selector-libcpufreq.h
@@ -52,7 +52,6 @@ struct _CPUFreqSelectorLibcpufreqClass {
 CPUFreqSelectorClass parent_class;
 };
 
-
 GType cpufreq_selector_libcpufreq_get_type (void) G_GNUC_CONST;
 CPUFreqSelector *cpufreq_selector_libcpufreq_new (guint cpu);
 
diff --git a/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c b/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c
index 6ce03984..cad5c5a5 100644
--- a/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c
+++ b/cpufreq/src/cpufreq-selector/cpufreq-selector-service.c
@@ -438,7 +438,6 @@ cpufreq_selector_service_set_governor (CPUFreqSelectorService *service,
 return TRUE;
 }
 
-
 gboolean
 cpufreq_selector_service_can_set (CPUFreqSelectorService *service,
 DBusGMethodInvocation *context)
diff --git a/cpufreq/src/cpufreq-selector/cpufreq-selector-sysfs.h b/cpufreq/src/cpufreq-selector/cpufreq-selector-sysfs.h
index f0b90555..6fb9cab2 100644
--- a/cpufreq/src/cpufreq-selector/cpufreq-selector-sysfs.h
+++ b/cpufreq/src/cpufreq-selector/cpufreq-selector-sysfs.h
@@ -49,7 +49,6 @@ struct _CPUFreqSelectorSysfsClass {
 CPUFreqSelectorClass parent_class;
 };
 
-
 GType cpufreq_selector_sysfs_get_type (void) G_GNUC_CONST;
 CPUFreqSelector *cpufreq_selector_sysfs_new (guint cpu);
 
diff --git a/cpufreq/src/cpufreq-selector/cpufreq-selector.h b/cpufreq/src/cpufreq-selector/cpufreq-selector.h
index 05489e26..b1fc5162 100644
--- a/cpufreq/src/cpufreq-selector/cpufreq-selector.h
+++ b/cpufreq/src/cpufreq-selector/cpufreq-selector.h
@@ -60,7 +60,6 @@ struct _CPUFreqSelectorClass {
 GError **error);
 };
 
-
 GType cpufreq_selector_get_type (void) G_GNUC_CONST;
 GQuark cpufreq_selector_error_quark (void) G_GNUC_CONST;
 
diff --git a/cpufreq/src/cpufreq-selector/main.c b/cpufreq/src/cpufreq-selector/main.c
index 749653db..4993c430 100644
--- a/cpufreq/src/cpufreq-selector/main.c
+++ b/cpufreq/src/cpufreq-selector/main.c
@@ -33,7 +33,6 @@
 #endif
 #include "cpufreq-selector-factory.h"
 
-
 static gint cpu = 0;
 static gchar *governor = NULL;
 static gulong frequency = 0;