diff options
| author | David <dbphillipsnz@gmail.com> | 2014-04-30 11:56:44 +1200 |
|---|---|---|
| committer | David <dbphillipsnz@gmail.com> | 2014-06-06 20:27:42 +1200 |
| commit | abbf6164e196115c488e26dc1bd3bf777a4e8039 (patch) | |
| tree | 761b278ae6b2d768af561f9b16624bd9c88ee25b | |
| parent | 06b99181bdd885fa73f1afe2d4efa2313e7e8b04 (diff) | |
| download | paramano-abbf6164e196115c488e26dc1bd3bf777a4e8039.tar.xz | |
Inital jump to Gtk3
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | bat_tray/bat_tray.c | 2 | ||||
| -rw-r--r-- | tray.c | 3 |
3 files changed, 5 insertions, 4 deletions
@@ -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); } @@ -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(); } |