Merge branch 'gtk3'

Conflicts:
	Makefile
	tray.c

3 files changed, 3 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index 2cda57a..9088522 100644
--- a/Makefile
+++ b/Makefile
@@ -15,8 +15,7 @@ GTK_CFLAGS				=	-I/usr/include/gtk-2.0 \
 							-I/usr/include/cairo \
 							-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 ac9596d..378c386 100644
--- a/tray.c
+++ b/tray.c
@@ -221,7 +221,7 @@ 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_timeout_add(1000, update_icon, NULL);
 	tray_init_menu();
 }