diff options
author | Gerald Combs <gerald@wireshark.org> | 2012-12-15 01:04:39 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2012-12-15 01:04:39 +0000 |
commit | 5c2c5aed87a35800a8136b34e576aaf53ad25c1a (patch) | |
tree | 0aa9c2b38d1eb1ec46591c280f5addcf5c0c3760 /ui/qt/main_status_bar.cpp | |
parent | 92cfec56b8abd8cd04c0133763fea2ddbd9a197e (diff) | |
download | wireshark-5c2c5aed87a35800a8136b34e576aaf53ad25c1a.tar.gz |
Rename the search type menu items to more accurately reflect what we're
actually doing and what users are likely to want to do. Rename the
search enum values and functions to reflect what we're actually doing
and add a comment explaining why making searches more correct might make
searching worse. Add a search bar to the Qt main window, thus
continuing the War On Gratuitous Dialogs.
Clear out any previous temporary label stack items before adding a new one.
svn path=/trunk/; revision=46541
Diffstat (limited to 'ui/qt/main_status_bar.cpp')
-rw-r--r-- | ui/qt/main_status_bar.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ui/qt/main_status_bar.cpp b/ui/qt/main_status_bar.cpp index 894c2ccb51..deaa1829af 100644 --- a/ui/qt/main_status_bar.cpp +++ b/ui/qt/main_status_bar.cpp @@ -64,19 +64,15 @@ void statusbar_push_temporary_msg(const gchar *msg_format, ...) { va_list ap; - gchar *msg; - QString pushMsg; + QString push_msg; if (!cur_main_status_bar_) return; va_start(ap, msg_format); - msg = g_strdup_vprintf(msg_format, ap); + push_msg.vsprintf(msg_format, ap); va_end(ap); - pushMsg.fromUtf8(msg); - g_free(msg); - - cur_main_status_bar_->pushTemporaryStatus(pushMsg); + cur_main_status_bar_->pushTemporaryStatus(push_msg); } /* |