From abbf6164e196115c488e26dc1bd3bf777a4e8039 Mon Sep 17 00:00:00 2001 From: David Date: Wed, 30 Apr 2014 11:56:44 +1200 Subject: Inital jump to Gtk3 --- Makefile | 4 ++-- bat_tray/bat_tray.c | 2 +- tray.c | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 2cda57a..21bb983 100644 --- a/Makefile +++ b/Makefile @@ -16,8 +16,8 @@ GTK_CFLAGS = -I/usr/include/gtk-2.0 \ -I/usr/include/gdk-pixbuf-2.0 \ -I/usr/include/atk-1.0 -GTK_LIBS = -lgtk-x11-2.0 \ - -lgobject-2.0 +GTK_LIBS = -lgtk-3 \ + -lgobject-2.0 trayfreq_CFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) -Wall -D_=gettext diff --git a/bat_tray/bat_tray.c b/bat_tray/bat_tray.c index 181f8d5..ea7b3c7 100644 --- a/bat_tray/bat_tray.c +++ b/bat_tray/bat_tray.c @@ -135,7 +135,7 @@ void bat_tray_init() gtk_status_icon_set_from_file(tray, icon_file); gtk_status_icon_set_has_tooltip (tray, TRUE); g_signal_connect(G_OBJECT(tray), "query-tooltip", GTK_SIGNAL_FUNC(update_tooltip), NULL); - gtk_timeout_add(5000, update_icon, NULL); + g_timeout_add(5000, update_icon, NULL); } diff --git a/tray.c b/tray.c index ac9596d..eb6c65a 100644 --- a/tray.c +++ b/tray.c @@ -221,7 +221,8 @@ void tray_init() gtk_status_icon_set_has_tooltip (tray, TRUE); g_signal_connect(G_OBJECT(tray), "query-tooltip", GTK_SIGNAL_FUNC(update_tooltip), NULL); g_signal_connect(G_OBJECT(tray), "popup-menu", GTK_SIGNAL_FUNC(popup_menu), NULL); - gtk_timeout_add(1000, update_icon, NULL); + g_signal_connect(G_OBJECT(tray), "activate", GTK_SIGNAL_FUNC(activate), NULL); + g_timeout_add(1000, update_icon, NULL); tray_init_menu(); } -- cgit v1.1