diff options
author | David <dbphillipsnz@gmail.com> | 2014-04-30 17:14:36 +1200 |
---|---|---|
committer | David <dbphillipsnz@gmail.com> | 2014-04-30 17:14:36 +1200 |
commit | 7386dff9f7c768c5226bd140cec3091ba90bb9df (patch) | |
tree | 423b0cfa42af6056784a96f702d4ffd2437097f3 /bat_tray | |
parent | 06b99181bdd885fa73f1afe2d4efa2313e7e8b04 (diff) | |
parent | 69faf20805fa83517abe01f00060a9bbe0235da5 (diff) | |
download | paramano-7386dff9f7c768c5226bd140cec3091ba90bb9df.tar.xz |
Merge branch 'gtk3'
Conflicts:
Makefile
tray.c
Diffstat (limited to 'bat_tray')
-rw-r--r-- | bat_tray/bat_tray.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); } |