11 files changed, 88 insertions, 76 deletions
diff --git a/configure.ac b/configure.ac
index 04965bf7..ba388a3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -602,7 +602,9 @@ cpufreq/src/cpufreq-selector/Makefile
 cpufreq/pixmaps/Makefile
 cpufreq/help/Makefile
 timerapplet/Makefile
-timerapplet/org.mate.panel.applet.timer.gschema.xml
+timerapplet/data/Makefile
+timerapplet/data/org.mate.panel.applet.timer.gschema.xml
+timerapplet/src/Makefile
 command/Makefile
 command/data/Makefile
 command/data/org.mate.panel.applet.command.gschema.xml
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 26050786..191e1898 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -68,10 +68,10 @@ stickynotes/org.mate.stickynotes.gschema.xml.in
 stickynotes/stickynotes_applet.c
 stickynotes/stickynotes_applet_callbacks.c
 stickynotes/stickynotes_callbacks.c
-timerapplet/org.mate.applets.TimerApplet.mate-panel-applet.desktop.in.in
-timerapplet/org.mate.panel.applet.timer.gschema.xml.in
-timerapplet/timerapplet.c
-timerapplet/timerapplet-preferences.ui
+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/src/trashapplet.c
 trashapplet/src/trash-empty.c
diff --git a/timerapplet/Makefile.am b/timerapplet/Makefile.am
index 520c9553..5d55ad08 100644
--- a/timerapplet/Makefile.am
+++ b/timerapplet/Makefile.am
@@ -1,73 +1,3 @@
-NULL =
-
-AM_CPPFLAGS = \
- $(MATE_APPLETS4_CFLAGS) \
- $(LIBNOTIFY_CFLAGS) \
- -I$(srcdir) \
- $(DISABLE_DEPRECATED_CFLAGS)
-
-APPLET_LOCATION = $(libexecdir)/timer-applet
-
-libexec_PROGRAMS = timer-applet
-
-BUILT_SOURCES = timerapplet-resources.c timerapplet-resources.h
-nodist_timer_applet_SOURCES = $(BUILT_SOURCES)
-timer_applet_SOURCES = \
- timerapplet.c \
- $(NULL)
-
-timer_applet_LDADD = \
- $(MATE_APPLETS4_LIBS) \
- $(LIBNOTIFY_LIBS) \
- $(NULL)
-
-timer_applet_CFLAGS = $(WARN_CFLAGS)
-
-timerapplet-resources.c: timerapplet-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/timerapplet-resources.gresource.xml)
- $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name timerapplet $<
-
-timerapplet-resources.h: timerapplet-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/timerapplet-resources.gresource.xml)
- $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name timerapplet $<
-
-appletsdir = $(datadir)/mate-panel/applets
-applets_in_files = org.mate.applets.TimerApplet.mate-panel-applet.desktop.in
-applets_DATA = $(applets_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
-
-$(applets_in_files): $(applets_in_files).in Makefile
- $(AM_V_GEN)sed \
- -e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
- $< > $@
-$(applets_DATA): $(applets_in_files) Makefile
- $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
-
-servicedir = $(datadir)/dbus-1/services
-service_in_files = org.mate.panel.applet.TimerAppletFactory.service.in
-service_DATA = $(service_in_files:.service.in=.service)
-
-org.mate.panel.applet.TimerAppletFactory.service: $(service_in_files)
- $(AM_V_GEN)sed \
- -e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
- $< > $@
-
-timer_gschema_in_files = org.mate.panel.applet.timer.gschema.xml.in
-gsettings_SCHEMAS = $(timer_gschema_in_files:.xml.in=.xml)
-@GSETTINGS_RULES@
-
-EXTRA_DIST = \
- $(applets_in_files).in \
- $(service_in_files) \
- $(timer_gschema_in_files) \
- timerapplet-preferences.ui \
- timerapplet-resources.gresource.xml \
- $(NULL)
-
-CLEANFILES = \
- $(BUILT_SOURCES) \
- $(applets_DATA) \
- $(applets_in_files) \
- $(service_DATA) \
- $(gsettings_SCHEMAS) \
- *.gschema.valid \
- $(NULL)
+SUBDIRS = data src
 
 -include $(top_srcdir)/git.mk
diff --git a/timerapplet/data/Makefile.am b/timerapplet/data/Makefile.am
new file mode 100644
index 00000000..2c034da3
--- /dev/null
+++ b/timerapplet/data/Makefile.am
@@ -0,0 +1,45 @@
+NULL =
+
+APPLET_LOCATION = $(libexecdir)/timer-applet
+
+appletsdir = $(datadir)/mate-panel/applets
+applets_in_files = org.mate.applets.TimerApplet.mate-panel-applet.desktop.in
+applets_DATA = $(applets_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
+
+$(applets_in_files): $(applets_in_files).in Makefile
+ $(AM_V_GEN)sed \
+ -e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
+ $< > $@
+$(applets_DATA): $(applets_in_files) Makefile
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
+
+servicedir = $(datadir)/dbus-1/services
+service_in_files = org.mate.panel.applet.TimerAppletFactory.service.in
+service_DATA = $(service_in_files:.service.in=.service)
+
+org.mate.panel.applet.TimerAppletFactory.service: $(service_in_files)
+ $(AM_V_GEN)sed \
+ -e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
+ $< > $@
+
+timer_gschema_in_files = org.mate.panel.applet.timer.gschema.xml.in
+gsettings_SCHEMAS = $(timer_gschema_in_files:.xml.in=.xml)
+@GSETTINGS_RULES@
+
+EXTRA_DIST = \
+ $(applets_in_files).in \
+ $(service_in_files) \
+ $(timer_gschema_in_files) \
+ timerapplet-preferences.ui \
+ timerapplet-resources.gresource.xml \
+ $(NULL)
+
+CLEANFILES = \
+ $(applets_DATA) \
+ $(applets_in_files) \
+ $(service_DATA) \
+ $(gsettings_SCHEMAS) \
+ *.gschema.valid \
+ $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/timerapplet/org.mate.applets.TimerApplet.mate-panel-applet.desktop.in.in b/timerapplet/data/org.mate.applets.TimerApplet.mate-panel-applet.desktop.in.in
index a111eb28..a111eb28 100644
--- a/timerapplet/org.mate.applets.TimerApplet.mate-panel-applet.desktop.in.in
+++ b/timerapplet/data/org.mate.applets.TimerApplet.mate-panel-applet.desktop.in.in
diff --git a/timerapplet/org.mate.panel.applet.TimerAppletFactory.service.in b/timerapplet/data/org.mate.panel.applet.TimerAppletFactory.service.in
index b8cd68cc..b8cd68cc 100644
--- a/timerapplet/org.mate.panel.applet.TimerAppletFactory.service.in
+++ b/timerapplet/data/org.mate.panel.applet.TimerAppletFactory.service.in
diff --git a/timerapplet/org.mate.panel.applet.timer.gschema.xml.in b/timerapplet/data/org.mate.panel.applet.timer.gschema.xml.in
index 1201c8a6..1201c8a6 100644
--- a/timerapplet/org.mate.panel.applet.timer.gschema.xml.in
+++ b/timerapplet/data/org.mate.panel.applet.timer.gschema.xml.in
diff --git a/timerapplet/timerapplet-preferences.ui b/timerapplet/data/timerapplet-preferences.ui
index 04e13e7d..04e13e7d 100644
--- a/timerapplet/timerapplet-preferences.ui
+++ b/timerapplet/data/timerapplet-preferences.ui
diff --git a/timerapplet/timerapplet-resources.gresource.xml b/timerapplet/data/timerapplet-resources.gresource.xml
index 71b7915a..71b7915a 100644
--- a/timerapplet/timerapplet-resources.gresource.xml
+++ b/timerapplet/data/timerapplet-resources.gresource.xml
diff --git a/timerapplet/src/Makefile.am b/timerapplet/src/Makefile.am
new file mode 100644
index 00000000..6eb47ec9
--- /dev/null
+++ b/timerapplet/src/Makefile.am
@@ -0,0 +1,35 @@
+NULL =
+
+AM_CPPFLAGS = \
+ $(MATE_APPLETS4_CFLAGS) \
+ $(LIBNOTIFY_CFLAGS) \
+ -I$(srcdir) \
+ $(DISABLE_DEPRECATED_CFLAGS) \
+ $(NULL)
+
+libexec_PROGRAMS = timer-applet
+
+BUILT_SOURCES = timerapplet-resources.c timerapplet-resources.h
+nodist_timer_applet_SOURCES = $(BUILT_SOURCES)
+timer_applet_SOURCES = \
+ timerapplet.c \
+ $(NULL)
+
+timer_applet_LDADD = \
+ $(MATE_APPLETS4_LIBS) \
+ $(LIBNOTIFY_LIBS) \
+ $(NULL)
+
+timer_applet_CFLAGS = $(WARN_CFLAGS)
+
+timerapplet-resources.c: $(srcdir)/../data/timerapplet-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data --generate-dependencies $(srcdir)/../data/timerapplet-resources.gresource.xml)
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name timerapplet $<
+
+timerapplet-resources.h: $(srcdir)/../data/timerapplet-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data --generate-dependencies $(srcdir)/../data/timerapplet-resources.gresource.xml)
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name timerapplet $<
+
+CLEANFILES = \
+ $(BUILT_SOURCES) \
+ $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/timerapplet/timerapplet.c b/timerapplet/src/timerapplet.c
index 0948be43..0948be43 100644
--- a/timerapplet/timerapplet.c
+++ b/timerapplet/src/timerapplet.c