From 7d3af86c0d0c59d17f6beeb5cd2a9289e6a23f82 Mon Sep 17 00:00:00 2001 From: Muneyuki Noguchi Date: Mon, 19 Mar 2012 22:24:34 +0900 Subject: [PATCH] Change behavior of toolbar when toolbar-display-time is mode. * gtk2/toolbar/common-gtk.c * qt4/toolbar/common-uimstateindicator.cpp - Don't hide toolbar when mode is "off". - Hide toolbar when mode is "direct". --- gtk2/toolbar/common-gtk.c | 2 +- qt4/toolbar/common-uimstateindicator.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk2/toolbar/common-gtk.c b/gtk2/toolbar/common-gtk.c index 369fc49..d1a574d 100644 --- a/gtk2/toolbar/common-gtk.c +++ b/gtk2/toolbar/common-gtk.c @@ -772,7 +772,7 @@ helper_toolbar_prop_list_update(GtkWidget *widget, gchar **lines) indication_id, iconic_label, tooltip_str); append_prop_button(widget, button); - if (!is_hidden && (!strcmp(indication_id, "off") + if (!is_hidden && (!strcmp(indication_id, "direct") || g_str_has_suffix(indication_id, "_direct"))) { is_hidden = TRUE; } diff --git a/qt4/toolbar/common-uimstateindicator.cpp b/qt4/toolbar/common-uimstateindicator.cpp index 7bf75a2..6b02f8b 100644 --- a/qt4/toolbar/common-uimstateindicator.cpp +++ b/qt4/toolbar/common-uimstateindicator.cpp @@ -190,7 +190,7 @@ void UimStateIndicator::propListUpdate( const QStringList& lines ) if ( isDarkBg && !QFile::exists( fileName ) ) { fileName = ICONDIR + '/' + fields[1] + ".png"; } - if ( !isHidden && (fields[1] == "off" + if ( !isHidden && (fields[1] == "direct" || fields[1].endsWith( "_direct" ) ) ) { isHidden = true; } -- 1.7.7.6