diff options
Diffstat (limited to 'timerapplet/src')
| -rw-r--r-- | timerapplet/src/Makefile.am | 29 | ||||
| -rw-r--r-- | timerapplet/src/timerapplet.c | 41 |
2 files changed, 48 insertions, 22 deletions
diff --git a/timerapplet/src/Makefile.am b/timerapplet/src/Makefile.am index 6eb47ec9..75688baa 100644 --- a/timerapplet/src/Makefile.am +++ b/timerapplet/src/Makefile.am @@ -7,20 +7,35 @@ AM_CPPFLAGS = \ $(DISABLE_DEPRECATED_CFLAGS) \ $(NULL) -libexec_PROGRAMS = timer-applet +AM_CFLAGS = $(WARN_CFLAGS) -BUILT_SOURCES = timerapplet-resources.c timerapplet-resources.h -nodist_timer_applet_SOURCES = $(BUILT_SOURCES) -timer_applet_SOURCES = \ - timerapplet.c \ +BUILT_SOURCES = \ + timerapplet-resources.c \ + timerapplet-resources.h \ + $(NULL) +APPLET_SOURCES = \ + timerapplet.c \ $(NULL) -timer_applet_LDADD = \ +APPLET_LIBS = \ $(MATE_APPLETS4_LIBS) \ $(LIBNOTIFY_LIBS) \ $(NULL) -timer_applet_CFLAGS = $(WARN_CFLAGS) +if ENABLE_IN_PROCESS +pkglib_LTLIBRARIES = libmate-timer-applet.la +nodist_libmate_timer_applet_la_SOURCES = $(BUILT_SOURCES) +libmate_timer_applet_la_SOURCES = $(APPLET_SOURCES) +libmate_timer_applet_la_CFLAGS = $(AM_CFLAGS) +libmate_timer_applet_la_LDFLAGS = -module -avoid-version +libmate_timer_applet_la_LIBADD = $(APPLET_LIBS) +else !ENABLE_IN_PROCESS +libexec_PROGRAMS = timer-applet +nodist_timer_applet_SOURCES = $(BUILT_SOURCES) +timer_applet_SOURCES = $(APPLET_SOURCES) +timer_applet_CFLAGS = $(AM_CFLAGS) +timer_applet_LDADD = $(APPLET_LIBS) +endif !ENABLE_IN_PROCESS 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 $< diff --git a/timerapplet/src/timerapplet.c b/timerapplet/src/timerapplet.c index 8399ebb0..c5cb2107 100644 --- a/timerapplet/src/timerapplet.c +++ b/timerapplet/src/timerapplet.c @@ -27,6 +27,7 @@ #include <glib.h> #include <glib/gi18n.h> #include <gio/gio.h> +#include <gdk/gdkx.h> #include <gtk/gtk.h> #include <libnotify/notify.h> @@ -125,6 +126,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)); @@ -158,7 +162,7 @@ timer_callback (TimerApplet *applet) gtk_widget_set_tooltip_text (GTK_WIDGET (applet->label), name); gtk_widget_hide (GTK_WIDGET (applet->pause_image)); atk_object_set_name (atk_obj, label); - atk_object_set_description (atk_obj, tooltip); + atk_object_set_description (atk_obj, ""); if (g_settings_get_boolean (applet->settings, SHOW_NOTIFICATION_KEY)) { @@ -350,15 +354,20 @@ timer_preferences_callback (GtkAction *action, TimerApplet *applet) } static gboolean -timer_applet_click (TimerApplet *applet) +timer_applet_click (TimerApplet *applet, GdkEventButton *event) { - if (!applet->active && !applet->pause && applet->elapsed) - timer_reset_callback (NULL, applet); - else if (applet->active && !applet->pause) - timer_pause_callback (NULL, applet); - else if (!applet->active || applet->pause) - timer_start_callback (NULL, applet); - return FALSE; + if ( event->button == 1) + { + if (!applet->active && !applet->pause && applet->elapsed) + timer_reset_callback (NULL, applet); + else if (applet->active && !applet->pause) + timer_pause_callback (NULL, applet); + else if (!applet->active || applet->pause) + timer_start_callback (NULL, applet); + return TRUE; + } + else + return FALSE; } static void @@ -373,7 +382,9 @@ timer_applet_fill (MatePanelApplet* applet_widget) TimerApplet *applet; AtkObject *atk_obj; +#ifndef ENABLE_IN_PROCESS g_set_application_name (_("Timer Applet")); +#endif gtk_window_set_default_icon_name (APPLET_ICON); if (!notify_is_initted ()) @@ -419,7 +430,7 @@ timer_applet_fill (MatePanelApplet* applet_widget) G_CALLBACK (timer_applet_destroy), applet); - g_signal_connect_swapped (applet->applet, "button-release-event", + g_signal_connect_swapped (applet->applet, "button-press-event", G_CALLBACK (timer_applet_click), applet); @@ -454,8 +465,8 @@ timer_factory (MatePanelApplet* applet, const char* iid, gpointer data) } /* needed by mate-panel applet library */ -MATE_PANEL_APPLET_OUT_PROCESS_FACTORY("TimerAppletFactory", - PANEL_TYPE_APPLET, - "Timer applet", - timer_factory, - NULL) +PANEL_APPLET_FACTORY ("TimerAppletFactory", + PANEL_TYPE_APPLET, + "Timer applet", + timer_factory, + NULL) |