summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.build.yml1
-rw-r--r--accessx-status/src/applet.c10
-rw-r--r--battstat/battstat_applet.c4
-rw-r--r--charpick/charpick.c14
-rw-r--r--command/src/command.c2
-rw-r--r--configure.ac4
-rw-r--r--cpufreq/Makefile.am47
-rw-r--r--cpufreq/data/Makefile.am46
-rw-r--r--cpufreq/data/cpufreq-applet-menu.xml (renamed from cpufreq/cpufreq-applet-menu.xml)0
-rw-r--r--cpufreq/data/cpufreq-preferences.ui (renamed from cpufreq/cpufreq-preferences.ui)0
-rw-r--r--cpufreq/data/cpufreq-resources.gresource.xml (renamed from cpufreq/cpufreq-resources.gresource.xml)0
-rw-r--r--cpufreq/data/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in (renamed from cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in)0
-rw-r--r--cpufreq/data/org.mate.panel.applet.CPUFreqAppletFactory.service.in (renamed from cpufreq/org.mate.panel.applet.CPUFreqAppletFactory.service.in)0
-rw-r--r--cpufreq/data/org.mate.panel.applet.cpufreq.gschema.xml.in (renamed from cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in)0
-rw-r--r--cpufreq/src/Makefile.am8
-rw-r--r--drivemount/src/drive-list.c12
-rw-r--r--drivemount/src/drivemount.c6
-rw-r--r--mateweather/src/mateweather-applet.c8
-rw-r--r--mateweather/src/mateweather-pref.c2
-rw-r--r--multiload/src/load-graph.c2
-rw-r--r--multiload/src/main.c8
-rw-r--r--netspeed/src/netspeed.c10
-rw-r--r--po/POTFILES.in10
-rw-r--r--trashapplet/Makefile.am33
-rw-r--r--trashapplet/data/Makefile.am32
-rw-r--r--trashapplet/data/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in (renamed from trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in)0
-rw-r--r--trashapplet/data/org.mate.panel.applet.TrashAppletFactory.service.in (renamed from trashapplet/org.mate.panel.applet.TrashAppletFactory.service.in)0
-rw-r--r--trashapplet/data/trashapplet-empty-progress.ui (renamed from trashapplet/trashapplet-empty-progress.ui)0
-rw-r--r--trashapplet/data/trashapplet-menu.xml (renamed from trashapplet/trashapplet-menu.xml)0
-rw-r--r--trashapplet/data/trashapplet-resources.gresource.xml (renamed from trashapplet/trashapplet-resources.gresource.xml)0
-rw-r--r--trashapplet/src/Makefile.am8
31 files changed, 135 insertions, 132 deletions
diff --git a/.build.yml b/.build.yml
index 2342c7e2..bf0a9e48 100644
--- a/.build.yml
+++ b/.build.yml
@@ -89,7 +89,6 @@ requires:
- redhat-rpm-config
- startup-notification-devel
- upower-devel
- - wireless-tools-devel
ubuntu:
- autopoint
diff --git a/accessx-status/src/applet.c b/accessx-status/src/applet.c
index c24a6561..88239c7f 100644
--- a/accessx-status/src/applet.c
+++ b/accessx-status/src/applet.c
@@ -1633,16 +1633,16 @@ accessx_status_applet_fill (MatePanelApplet* applet)
}
g_object_connect (sapplet->applet,
- "signal::destroy", accessx_status_applet_destroy, sapplet,
- "signal::change_orient", accessx_status_applet_reorient, sapplet,
- "signal::change_size", accessx_status_applet_resize, sapplet,
+ "destroy", accessx_status_applet_destroy, sapplet,
+ "change-orient", accessx_status_applet_reorient, sapplet,
+ "change-size", accessx_status_applet_resize, sapplet,
NULL);
- g_signal_connect (sapplet->applet, "button_press_event",
+ g_signal_connect (sapplet->applet, "button-press-event",
G_CALLBACK (button_press_cb),
sapplet);
- g_signal_connect (sapplet->applet, "key_press_event",
+ g_signal_connect (sapplet->applet, "key-press-event",
G_CALLBACK (key_press_cb),
sapplet);
diff --git a/battstat/battstat_applet.c b/battstat/battstat_applet.c
index 41f29fa0..e3c83ac3 100644
--- a/battstat/battstat_applet.c
+++ b/battstat/battstat_applet.c
@@ -1093,11 +1093,11 @@ create_layout (ProgressData *battstat)
G_CALLBACK (destroy_applet),
battstat);
- g_signal_connect (battstat->applet, "change_orient",
+ g_signal_connect (battstat->applet, "change-orient",
G_CALLBACK (change_orient),
battstat);
- g_signal_connect (battstat->applet, "size_allocate",
+ g_signal_connect (battstat->applet, "size-allocate",
G_CALLBACK (size_allocate),
battstat);
diff --git a/charpick/charpick.c b/charpick/charpick.c
index d428931c..46b2dad8 100644
--- a/charpick/charpick.c
+++ b/charpick/charpick.c
@@ -442,7 +442,7 @@ build_table (charpick_data *p_curr_data)
G_CALLBACK (chooser_button_clicked),
p_curr_data);
- g_signal_connect (button, "button_press_event",
+ g_signal_connect (button, "button-press-event",
G_CALLBACK (button_press_hack),
p_curr_data->applet);
}
@@ -493,7 +493,7 @@ build_table (charpick_data *p_curr_data)
G_CALLBACK (toggle_button_toggled_cb),
p_curr_data);
- g_signal_connect (toggle_button[i], "button_press_event",
+ g_signal_connect (toggle_button[i], "button-press-event",
G_CALLBACK (button_press_hack),
p_curr_data->applet);
}
@@ -796,7 +796,7 @@ charpicker_applet_fill (MatePanelApplet *applet)
|| (orientation == MATE_PANEL_APPLET_ORIENT_RIGHT);
build_table (curr_data);
- g_signal_connect (curr_data->applet, "key_press_event",
+ g_signal_connect (curr_data->applet, "key-press-event",
G_CALLBACK (key_press_event), curr_data);
utf8_atom = gdk_atom_intern ("UTF8_STRING", FALSE);
@@ -812,21 +812,21 @@ charpicker_applet_fill (MatePanelApplet *applet)
GDK_SELECTION_CLIPBOARD,
utf8_atom, 0);
- g_signal_connect (curr_data->invisible, "selection_get",
+ g_signal_connect (curr_data->invisible, "selection-get",
G_CALLBACK (charpick_selection_handler),
curr_data);
- g_signal_connect (curr_data->invisible, "selection_clear_event",
+ g_signal_connect (curr_data->invisible, "selection-clear-event",
G_CALLBACK (selection_clear_cb),
curr_data);
make_applet_accessible (GTK_WIDGET (applet));
/* session save signal */
- g_signal_connect (applet, "change_orient",
+ g_signal_connect (applet, "change-orient",
G_CALLBACK (applet_change_orient), curr_data);
- g_signal_connect (applet, "size_allocate",
+ g_signal_connect (applet, "size-allocate",
G_CALLBACK (applet_size_allocate), curr_data);
g_signal_connect (applet, "destroy",
diff --git a/command/src/command.c b/command/src/command.c
index ac756eb2..2cc44e49 100644
--- a/command/src/command.c
+++ b/command/src/command.c
@@ -469,7 +469,7 @@ command_applet_fill (MatePanelApplet* applet)
"visible",
G_SETTINGS_BIND_DEFAULT);
- atk_widget = gtk_widget_get_accessible (command_applet->applet);
+ atk_widget = gtk_widget_get_accessible (GTK_WIDGET (command_applet->applet));
if (GTK_IS_ACCESSIBLE (atk_widget)) {
atk_object_set_name (atk_widget,
_("Command applet"));
diff --git a/configure.ac b/configure.ac
index ef62a368..a53924cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -594,11 +594,13 @@ stickynotes/org.mate.stickynotes.gschema.xml
stickynotes/pixmaps/Makefile
stickynotes/docs/Makefile
trashapplet/Makefile
+trashapplet/data/Makefile
trashapplet/src/Makefile
trashapplet/docs/Makefile
cpufreq/Makefile
+cpufreq/data/Makefile
+cpufreq/data/org.mate.panel.applet.cpufreq.gschema.xml
cpufreq/src/Makefile
-cpufreq/org.mate.panel.applet.cpufreq.gschema.xml
cpufreq/src/cpufreq-selector/Makefile
cpufreq/pixmaps/Makefile
cpufreq/help/Makefile
diff --git a/cpufreq/Makefile.am b/cpufreq/Makefile.am
index 8fb1386f..1fe1e1c9 100644
--- a/cpufreq/Makefile.am
+++ b/cpufreq/Makefile.am
@@ -1,48 +1,3 @@
-NULL =
-
-SUBDIRS = help pixmaps src
-
-cpufreq_gschema_in_files = org.mate.panel.applet.cpufreq.gschema.xml.in
-gsettings_SCHEMAS = $(cpufreq_gschema_in_files:.xml.in=.xml)
-
-appletdir = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in
-applet_DATA = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
-
-$(applet_in_files): $(applet_in_files).in Makefile
- $(AM_V_GEN)sed \
- -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
- -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
-
-$(applet_DATA): $(applet_in_files) Makefile
- $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o [email protected]
-
-servicedir = $(datadir)/dbus-1/services
-service_in_files = org.mate.panel.applet.CPUFreqAppletFactory.service.in
-service_DATA = $(service_in_files:.service.in=.service)
-
-org.mate.panel.applet.CPUFreqAppletFactory.service: $(service_in_files)
- $(AM_V_GEN)sed \
- -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
-
-CLEANFILES = \
- $(applet_DATA) \
- $(applet_in_files) \
- $(service_DATA) \
- $(gsettings_SCHEMAS) \
- *.gschema.valid \
- $(NULL)
-
-EXTRA_DIST = \
- $(applet_in_files).in \
- $(service_in_files) \
- $(cpufreq_gschema_in_files) \
- cpufreq-applet-menu.xml \
- cpufreq-preferences.ui \
- cpufreq-resources.gresource.xml \
- $(NULL)
+SUBDIRS = help pixmaps data src
-include $(top_srcdir)/git.mk
diff --git a/cpufreq/data/Makefile.am b/cpufreq/data/Makefile.am
new file mode 100644
index 00000000..b08d6345
--- /dev/null
+++ b/cpufreq/data/Makefile.am
@@ -0,0 +1,46 @@
+NULL =
+
+cpufreq_gschema_in_files = org.mate.panel.applet.cpufreq.gschema.xml.in
+gsettings_SCHEMAS = $(cpufreq_gschema_in_files:.xml.in=.xml)
+
+appletdir = $(datadir)/mate-panel/applets
+applet_in_files = org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in
+applet_DATA = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
+
+$(applet_in_files): $(applet_in_files).in Makefile
+ $(AM_V_GEN)sed \
+ -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
+ -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
+
+$(applet_DATA): $(applet_in_files) Makefile
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o [email protected]
+
+servicedir = $(datadir)/dbus-1/services
+service_in_files = org.mate.panel.applet.CPUFreqAppletFactory.service.in
+service_DATA = $(service_in_files:.service.in=.service)
+
+org.mate.panel.applet.CPUFreqAppletFactory.service: $(service_in_files)
+ $(AM_V_GEN)sed \
+ -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
+
+CLEANFILES = \
+ $(applet_DATA) \
+ $(applet_in_files) \
+ $(service_DATA) \
+ $(gsettings_SCHEMAS) \
+ *.gschema.valid \
+ $(NULL)
+
+EXTRA_DIST = \
+ $(applet_in_files).in \
+ $(service_in_files) \
+ $(cpufreq_gschema_in_files) \
+ cpufreq-applet-menu.xml \
+ cpufreq-preferences.ui \
+ cpufreq-resources.gresource.xml \
+ $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/cpufreq/cpufreq-applet-menu.xml b/cpufreq/data/cpufreq-applet-menu.xml
index 98375818..98375818 100644
--- a/cpufreq/cpufreq-applet-menu.xml
+++ b/cpufreq/data/cpufreq-applet-menu.xml
diff --git a/cpufreq/cpufreq-preferences.ui b/cpufreq/data/cpufreq-preferences.ui
index f155f73e..f155f73e 100644
--- a/cpufreq/cpufreq-preferences.ui
+++ b/cpufreq/data/cpufreq-preferences.ui
diff --git a/cpufreq/cpufreq-resources.gresource.xml b/cpufreq/data/cpufreq-resources.gresource.xml
index 6ae8945a..6ae8945a 100644
--- a/cpufreq/cpufreq-resources.gresource.xml
+++ b/cpufreq/data/cpufreq-resources.gresource.xml
diff --git a/cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in b/cpufreq/data/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in
index 168c6317..168c6317 100644
--- a/cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in
+++ b/cpufreq/data/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in
diff --git a/cpufreq/org.mate.panel.applet.CPUFreqAppletFactory.service.in b/cpufreq/data/org.mate.panel.applet.CPUFreqAppletFactory.service.in
index a04c672b..a04c672b 100644
--- a/cpufreq/org.mate.panel.applet.CPUFreqAppletFactory.service.in
+++ b/cpufreq/data/org.mate.panel.applet.CPUFreqAppletFactory.service.in
diff --git a/cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in b/cpufreq/data/org.mate.panel.applet.cpufreq.gschema.xml.in
index 694a75f7..694a75f7 100644
--- a/cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in
+++ b/cpufreq/data/org.mate.panel.applet.cpufreq.gschema.xml.in
diff --git a/cpufreq/src/Makefile.am b/cpufreq/src/Makefile.am
index e7b42722..86b18674 100644
--- a/cpufreq/src/Makefile.am
+++ b/cpufreq/src/Makefile.am
@@ -44,11 +44,11 @@ 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) [email protected] --sourcedir=$(top_srcdir)/cpufreq --generate --c-name cpufreq $<
+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) [email protected] --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) [email protected] --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) [email protected] --sourcedir=$(top_srcdir)/cpufreq/data --generate --c-name cpufreq $<
CLEANFILES = \
$(BUILT_SOURCES)
diff --git a/drivemount/src/drive-list.c b/drivemount/src/drive-list.c
index c8a0b2f7..21d5ee5c 100644
--- a/drivemount/src/drive-list.c
+++ b/drivemount/src/drive-list.c
@@ -87,17 +87,17 @@ drive_list_init (DriveList *self)
if (!volume_monitor)
volume_monitor = g_volume_monitor_get ();
- g_signal_connect_object (volume_monitor, "mount_added",
+ g_signal_connect_object (volume_monitor, "mount-added",
G_CALLBACK (mount_added), self, 0);
- g_signal_connect_object (volume_monitor, "mount_changed",
+ g_signal_connect_object (volume_monitor, "mount-changed",
G_CALLBACK (mount_changed), self, 0);
- g_signal_connect_object (volume_monitor, "mount_removed",
+ g_signal_connect_object (volume_monitor, "mount-removed",
G_CALLBACK (mount_removed), self, 0);
- g_signal_connect_object (volume_monitor, "volume_added",
+ g_signal_connect_object (volume_monitor, "volume-added",
G_CALLBACK (volume_added), self, 0);
- g_signal_connect_object (volume_monitor, "volume_changed",
+ g_signal_connect_object (volume_monitor, "volume-changed",
G_CALLBACK (volume_changed), self, 0);
- g_signal_connect_object (volume_monitor, "volume_removed",
+ g_signal_connect_object (volume_monitor, "volume-removed",
G_CALLBACK (volume_removed), self, 0);
volumes = g_volume_monitor_get_volumes (volume_monitor);
for (tmp = volumes; tmp != NULL; tmp = tmp->next) {
diff --git a/drivemount/src/drivemount.c b/drivemount/src/drivemount.c
index fa2857a1..a425237b 100644
--- a/drivemount/src/drivemount.c
+++ b/drivemount/src/drivemount.c
@@ -189,11 +189,11 @@ applet_factory (MatePanelApplet *applet,
gtk_container_add (GTK_CONTAINER (applet), drive_list);
- g_signal_connect_object (applet, "change_orient",
+ g_signal_connect_object (applet, "change-orient",
G_CALLBACK (change_orient), drive_list, 0);
- g_signal_connect_object (applet, "size_allocate",
+ g_signal_connect_object (applet, "size-allocate",
G_CALLBACK (size_allocate), drive_list, 0);
- g_signal_connect (applet, "change_background",
+ g_signal_connect (applet, "change-background",
G_CALLBACK (change_background), drive_list);
/* set initial state */
diff --git a/mateweather/src/mateweather-applet.c b/mateweather/src/mateweather-applet.c
index 098b620d..4000b692 100644
--- a/mateweather/src/mateweather-applet.c
+++ b/mateweather/src/mateweather-applet.c
@@ -345,11 +345,11 @@ void mateweather_applet_create (MateWeatherApplet *gw_applet)
gtk_window_set_default_icon_name ("weather-storm");
- g_signal_connect (gw_applet->applet, "change_orient",
+ g_signal_connect (gw_applet->applet, "change-orient",
G_CALLBACK (change_orient_cb),
gw_applet);
- g_signal_connect (gw_applet->applet, "size_allocate",
+ g_signal_connect (gw_applet->applet, "size-allocate",
G_CALLBACK (size_allocate_cb),
gw_applet);
@@ -357,11 +357,11 @@ void mateweather_applet_create (MateWeatherApplet *gw_applet)
G_CALLBACK (applet_destroy),
gw_applet);
- g_signal_connect (gw_applet->applet, "button_press_event",
+ g_signal_connect (gw_applet->applet, "button-press-event",
G_CALLBACK(clicked_cb),
gw_applet);
- g_signal_connect (gw_applet->applet, "key_press_event",
+ g_signal_connect (gw_applet->applet, "key-press-event",
G_CALLBACK (key_press_cb),
gw_applet);
diff --git a/mateweather/src/mateweather-pref.c b/mateweather/src/mateweather-pref.c
index 32314f37..2f5b268f 100644
--- a/mateweather/src/mateweather-pref.c
+++ b/mateweather/src/mateweather-pref.c
@@ -1174,7 +1174,7 @@ mateweather_pref_create (MateWeatherPref* pref)
#ifdef RADARMAP
g_signal_connect (pref->priv->basic_radar_btn, "toggled", G_CALLBACK (on_radar_toggled), pref);
g_signal_connect (pref->priv->basic_radar_url_btn, "toggled", G_CALLBACK (on_use_radar_url_toggled), pref);
- g_signal_connect (pref->priv->basic_radar_url_entry, "focus_out_event", G_CALLBACK (on_radar_url_changed), pref);
+ g_signal_connect (pref->priv->basic_radar_url_entry, "focus-out-event", G_CALLBACK (on_radar_url_changed), pref);
#endif /* RADARMAP */
#ifdef HAVE_LIBNOTIFY
g_signal_connect (pref->priv->basic_show_notifications_btn, "toggled", G_CALLBACK (on_show_notifications_toggled), pref);
diff --git a/multiload/src/load-graph.c b/multiload/src/load-graph.c
index 67fc09cd..e8ca8bd3 100644
--- a/multiload/src/load-graph.c
+++ b/multiload/src/load-graph.c
@@ -472,7 +472,7 @@ load_graph_new (MultiloadApplet *ma, guint n, const gchar *label,
g_signal_connect (g->disp, "draw",
G_CALLBACK (load_graph_expose), g);
- g_signal_connect (g->disp, "configure_event",
+ g_signal_connect (g->disp, "configure-event",
G_CALLBACK (load_graph_configure), g);
g_signal_connect (g->disp, "destroy",
G_CALLBACK (load_graph_destroy), g);
diff --git a/multiload/src/main.c b/multiload/src/main.c
index 1f2ac814..a80d9145 100644
--- a/multiload/src/main.c
+++ b/multiload/src/main.c
@@ -533,15 +533,15 @@ multiload_applet_new(MatePanelApplet *applet, const gchar *iid, gpointer data)
g_object_unref (action_group);
- g_signal_connect (applet, "change_size",
+ g_signal_connect (applet, "change-size",
G_CALLBACK (multiload_change_size_cb), ma);
- g_signal_connect (applet, "change_orient",
+ g_signal_connect (applet, "change-orient",
G_CALLBACK (multiload_change_orient_cb), ma);
g_signal_connect (applet, "destroy",
G_CALLBACK (multiload_destroy_cb), ma);
- g_signal_connect (applet, "button_press_event",
+ g_signal_connect (applet, "button-press-event",
G_CALLBACK (multiload_button_press_event_cb), ma);
- g_signal_connect (applet, "key_press_event",
+ g_signal_connect (applet, "key-press-event",
G_CALLBACK (multiload_key_press_event_cb), ma);
atk_obj = gtk_widget_get_accessible (GTK_WIDGET (applet));
diff --git a/netspeed/src/netspeed.c b/netspeed/src/netspeed.c
index 5982059e..60e2aec7 100644
--- a/netspeed/src/netspeed.c
+++ b/netspeed/src/netspeed.c
@@ -1681,7 +1681,7 @@ netspeed_applet_factory (MatePanelApplet *applet,
(GSourceFunc)timeout_function,
netspeed);
- g_signal_connect (applet, "change_size",
+ g_signal_connect (applet, "change-size",
G_CALLBACK (applet_change_size_or_orient),
netspeed);
@@ -1689,19 +1689,19 @@ netspeed_applet_factory (MatePanelApplet *applet,
G_CALLBACK (icon_theme_changed_cb),
netspeed);
- g_signal_connect (applet, "change_orient",
+ g_signal_connect (applet, "change-orient",
G_CALLBACK (applet_change_size_or_orient),
netspeed);
- g_signal_connect (netspeed->in_label, "size_allocate",
+ g_signal_connect (netspeed->in_label, "size-allocate",
G_CALLBACK (label_size_allocate_cb),
netspeed);
- g_signal_connect (netspeed->out_label, "size_allocate",
+ g_signal_connect (netspeed->out_label, "size-allocate",
G_CALLBACK (label_size_allocate_cb),
netspeed);
- g_signal_connect (netspeed->sum_label, "size_allocate",
+ g_signal_connect (netspeed->sum_label, "size-allocate",
G_CALLBACK (label_size_allocate_cb),
netspeed);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 621aebc8..1855a52d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -17,9 +17,9 @@ command/data/command-preferences.ui
command/data/org.mate.applets.CommandApplet.mate-panel-applet.desktop.in.in
command/data/org.mate.panel.applet.command.gschema.xml.in
command/src/command.c
-cpufreq/cpufreq-preferences.ui
-cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in
-cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in
+cpufreq/data/cpufreq-preferences.ui
+cpufreq/data/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in
+cpufreq/data/org.mate.panel.applet.cpufreq.gschema.xml.in
cpufreq/src/cpufreq-applet.c
cpufreq/src/cpufreq-prefs.c
cpufreq/src/cpufreq-monitor-cpuinfo.c
@@ -72,7 +72,7 @@ timerapplet/data/org.mate.applets.TimerApplet.mate-panel-applet.desktop.in.in
timerapplet/data/org.mate.panel.applet.timer.gschema.xml.in
timerapplet/data/timerapplet-preferences.ui
timerapplet/src/timerapplet.c
-trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in
+trashapplet/data/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in
+trashapplet/data/trashapplet-empty-progress.ui
trashapplet/src/trashapplet.c
trashapplet/src/trash-empty.c
-trashapplet/trashapplet-empty-progress.ui
diff --git a/trashapplet/Makefile.am b/trashapplet/Makefile.am
index 26b85624..5b5350a3 100644
--- a/trashapplet/Makefile.am
+++ b/trashapplet/Makefile.am
@@ -1,34 +1,3 @@
-SUBDIRS = src docs
-
-appletdir = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.TrashApplet.mate-panel-applet.desktop.in
-applet_DATA = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
-
-$(applet_in_files): $(applet_in_files).in Makefile
- $(AM_V_GEN)sed \
- -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
- -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
-
-$(applet_DATA): $(applet_in_files) Makefile
- $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o [email protected]
-
-servicedir = $(datadir)/dbus-1/services
-service_in_files = org.mate.panel.applet.TrashAppletFactory.service.in
-service_DATA = $(service_in_files:.service.in=.service)
-
-org.mate.panel.applet.TrashAppletFactory.service: $(service_in_files)
- $(AM_V_GEN)sed \
- -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
-
-EXTRA_DIST = \
- $(applet_in_files).in \
- $(service_in_files) \
- trashapplet-empty-progress.ui \
- trashapplet-menu.xml \
- trashapplet-resources.gresource.xml
-
-CLEANFILES = $(applet_DATA) $(applet_in_files) $(service_DATA)
+SUBDIRS = data src docs
-include $(top_srcdir)/git.mk
diff --git a/trashapplet/data/Makefile.am b/trashapplet/data/Makefile.am
new file mode 100644
index 00000000..8603d6c2
--- /dev/null
+++ b/trashapplet/data/Makefile.am
@@ -0,0 +1,32 @@
+appletdir = $(datadir)/mate-panel/applets
+applet_in_files = org.mate.applets.TrashApplet.mate-panel-applet.desktop.in
+applet_DATA = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
+
+$(applet_in_files): $(applet_in_files).in Makefile
+ $(AM_V_GEN)sed \
+ -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
+ -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
+
+$(applet_DATA): $(applet_in_files) Makefile
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o [email protected]
+
+servicedir = $(datadir)/dbus-1/services
+service_in_files = org.mate.panel.applet.TrashAppletFactory.service.in
+service_DATA = $(service_in_files:.service.in=.service)
+
+org.mate.panel.applet.TrashAppletFactory.service: $(service_in_files)
+ $(AM_V_GEN)sed \
+ -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
+
+EXTRA_DIST = \
+ $(applet_in_files).in \
+ $(service_in_files) \
+ trashapplet-empty-progress.ui \
+ trashapplet-menu.xml \
+ trashapplet-resources.gresource.xml
+
+CLEANFILES = $(applet_DATA) $(applet_in_files) $(service_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in b/trashapplet/data/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in
index 77161ccc..77161ccc 100644
--- a/trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in
+++ b/trashapplet/data/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in
diff --git a/trashapplet/org.mate.panel.applet.TrashAppletFactory.service.in b/trashapplet/data/org.mate.panel.applet.TrashAppletFactory.service.in
index ead24d1d..ead24d1d 100644
--- a/trashapplet/org.mate.panel.applet.TrashAppletFactory.service.in
+++ b/trashapplet/data/org.mate.panel.applet.TrashAppletFactory.service.in
diff --git a/trashapplet/trashapplet-empty-progress.ui b/trashapplet/data/trashapplet-empty-progress.ui
index 59c371a5..59c371a5 100644
--- a/trashapplet/trashapplet-empty-progress.ui
+++ b/trashapplet/data/trashapplet-empty-progress.ui
diff --git a/trashapplet/trashapplet-menu.xml b/trashapplet/data/trashapplet-menu.xml
index e2bc5359..e2bc5359 100644
--- a/trashapplet/trashapplet-menu.xml
+++ b/trashapplet/data/trashapplet-menu.xml
diff --git a/trashapplet/trashapplet-resources.gresource.xml b/trashapplet/data/trashapplet-resources.gresource.xml
index db287937..db287937 100644
--- a/trashapplet/trashapplet-resources.gresource.xml
+++ b/trashapplet/data/trashapplet-resources.gresource.xml
diff --git a/trashapplet/src/Makefile.am b/trashapplet/src/Makefile.am
index 194e44ad..2def1827 100644
--- a/trashapplet/src/Makefile.am
+++ b/trashapplet/src/Makefile.am
@@ -23,11 +23,11 @@ trashapplet_LDADD = \
$(GIO_LIBS) \
-lX11
-trashapplet-resources.c: ../trashapplet-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../ --generate-dependencies $(srcdir)/../trashapplet-resources.gresource.xml)
- $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) [email protected] --sourcedir=$(srcdir)/../ --generate --c-name trashapplet $<
+trashapplet-resources.c: ../data/trashapplet-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data/ --generate-dependencies $(srcdir)/../data/trashapplet-resources.gresource.xml)
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) [email protected] --sourcedir=$(srcdir)/../data/ --generate --c-name trashapplet $<
-trashapplet-resources.h: ../trashapplet-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../ --generate-dependencies $(srcdir)/../trashapplet-resources.gresource.xml)
- $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) [email protected] --sourcedir=$(srcdir)/../ --generate --c-name trashapplet $<
+trashapplet-resources.h: ../data/trashapplet-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data/ --generate-dependencies $(srcdir)/../data/trashapplet-resources.gresource.xml)
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) [email protected] --sourcedir=$(srcdir)/../data/ --generate --c-name trashapplet $<
CLEANFILES = \
$(BUILT_SOURCES)