From 69faf20805fa83517abe01f00060a9bbe0235da5 Mon Sep 17 00:00:00 2001 From: David Date: Wed, 30 Apr 2014 11:56:44 +1200 Subject: Inital jump to Gtk3 --- Makefile | 2 +- bat_tray/bat_tray.c | 2 +- tray.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3aa500a..fa1e7d1 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ 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 \ +GTK_LIBS = -lgtk-3 \ -lgobject-2.0 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 83ada19..c4c908c 100644 --- a/tray.c +++ b/tray.c @@ -242,7 +242,7 @@ void tray_init() 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); g_signal_connect(G_OBJECT(tray), "activate", GTK_SIGNAL_FUNC(activate), NULL); - gtk_timeout_add(1000, update_icon, NULL); + g_timeout_add(1000, update_icon, NULL); tray_init_menu(); } -- cgit v1.1