diff options
Diffstat (limited to 'timerapplet/src')
| -rw-r--r-- | timerapplet/src/Makefile.am | 16 | ||||
| -rw-r--r-- | timerapplet/src/timerapplet.c | 6 |
2 files changed, 12 insertions, 10 deletions
diff --git a/timerapplet/src/Makefile.am b/timerapplet/src/Makefile.am index 6eb47ec9..5341cc16 100644 --- a/timerapplet/src/Makefile.am +++ b/timerapplet/src/Makefile.am @@ -1,5 +1,8 @@ NULL = +mate_timer_applet_libdir= $(pkglibdir) +mate_timer_applet_lib_LTLIBRARIES=libmate-timer-applet.la + AM_CPPFLAGS = \ $(MATE_APPLETS4_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ @@ -7,20 +10,18 @@ AM_CPPFLAGS = \ $(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 = \ +libmate_timer_applet_la_SOURCES = \ timerapplet.c \ + timerapplet-resources.c \ + timerapplet-resources.h \ $(NULL) -timer_applet_LDADD = \ +libmate_timer_applet_la_LIBADD = \ $(MATE_APPLETS4_LIBS) \ $(LIBNOTIFY_LIBS) \ $(NULL) -timer_applet_CFLAGS = $(WARN_CFLAGS) +libmate_timer_applet_la_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 $< @@ -29,7 +30,6 @@ timerapplet-resources.h: $(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/src/timerapplet.c b/timerapplet/src/timerapplet.c index 8399ebb0..f2fcfc1e 100644 --- a/timerapplet/src/timerapplet.c +++ b/timerapplet/src/timerapplet.c @@ -125,6 +125,9 @@ timer_callback (TimerApplet *applet) label = NULL; tooltip = NULL; + if (!GTK_IS_WIDGET (applet->label)) + return FALSE; + name = g_settings_get_string (applet->settings, NAME_KEY); atk_obj = gtk_widget_get_accessible (GTK_WIDGET (applet->applet)); @@ -373,7 +376,6 @@ timer_applet_fill (MatePanelApplet* applet_widget) TimerApplet *applet; AtkObject *atk_obj; - g_set_application_name (_("Timer Applet")); gtk_window_set_default_icon_name (APPLET_ICON); if (!notify_is_initted ()) @@ -454,7 +456,7 @@ timer_factory (MatePanelApplet* applet, const char* iid, gpointer data) } /* needed by mate-panel applet library */ -MATE_PANEL_APPLET_OUT_PROCESS_FACTORY("TimerAppletFactory", +MATE_PANEL_APPLET_IN_PROCESS_FACTORY("TimerAppletFactory", PANEL_TYPE_APPLET, "Timer applet", timer_factory, |