summaryrefslogtreecommitdiffstats
path: root/gtk/src/main.c
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2014-10-28 17:24:53 +0000
committerjstebbins <[email protected]>2014-10-28 17:24:53 +0000
commit4be01e1889c3b113786618ba3bfae22fd1c5a748 (patch)
treec2e9fcb7c8c73070a786df919e4f0993d1609018 /gtk/src/main.c
parent5b3ef3c5c0bac20825b7d793c2cb4a48cabe3a2f (diff)
LinGui: remove GtkStatusIcon
It does nothing in gtk-3 and will be removed in future gtk versions. Support for status icons through libappindicator remains. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6470 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk/src/main.c')
-rw-r--r--gtk/src/main.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/gtk/src/main.c b/gtk/src/main.c
index e209fe7a5..a4fa56e9a 100644
--- a/gtk/src/main.c
+++ b/gtk/src/main.c
@@ -1057,20 +1057,10 @@ main(int argc, char *argv[])
{
app_indicator_set_status( ud->ai, APP_INDICATOR_STATUS_PASSIVE );
}
- GtkStatusIcon *si;
- si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
-
- gtk_status_icon_set_visible(si, FALSE );
#else
- GtkStatusIcon *si;
- si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
-
- gtk_status_icon_set_visible(si,
- ghb_settings_get_boolean(ud->prefs, "show_status"));
-
- gtk_status_icon_set_has_tooltip(si, TRUE);
- g_signal_connect(si, "query-tooltip",
- status_icon_query_tooltip_cb, ud);
+ // gtk-3 has eliminated status icons. Remove the option from preferences
+ GtkWidget *status_icon_pref = GHB_WIDGET(ud->builder, "show_status");
+ gtk_widget_set_visible(status_icon_pref, FALSE);
#endif
GtkWidget *ghb_window = GHB_WIDGET(ud->builder, "hb_window");
@@ -1220,7 +1210,6 @@ main(int argc, char *argv[])
// Everything should be go-to-go. Lets rock!
gtk_main();
- gtk_status_icon_set_visible(si, FALSE);
ghb_backend_close();
ghb_value_free(ud->queue);