[empathy] Move live search to top of Contact list
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] Move live search to top of Contact list
- Date: Mon, 22 Aug 2011 11:09:05 +0000 (UTC)
commit 4c534b01f55b25442d8399db4a610a3e1982daa9
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Mon Aug 22 13:02:42 2011 +0200
Move live search to top of Contact list
https://bugzilla.gnome.org/show_bug.cgi?id=656999
src/empathy-main-window.c | 5 ++++-
src/empathy-main-window.ui | 15 ++++++++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 167e338..62089b8 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -2105,6 +2105,7 @@ empathy_main_window_init (EmpathyMainWindow *window)
gchar *filename;
GSList *l;
GtkTreeModel *model;
+ GtkWidget *search_vbox;
priv = window->priv = G_TYPE_INSTANCE_GET_PRIVATE (window,
EMPATHY_TYPE_MAIN_WINDOW, EmpathyMainWindowPriv);
@@ -2141,6 +2142,7 @@ empathy_main_window_init (EmpathyMainWindow *window)
"no_entry_label", &priv->no_entry_label,
"roster_scrolledwindow", &sw,
"view_balance_show_in_roster", &priv->view_balance_show_in_roster,
+ "search_vbox", &search_vbox,
NULL);
g_free (filename);
@@ -2280,8 +2282,9 @@ empathy_main_window_init (EmpathyMainWindow *window)
GTK_WIDGET (priv->individual_view));
empathy_individual_view_set_live_search (priv->individual_view,
EMPATHY_LIVE_SEARCH (priv->search_bar));
- gtk_box_pack_start (GTK_BOX (priv->main_vbox), priv->search_bar,
+ gtk_box_pack_start (GTK_BOX (search_vbox), priv->search_bar,
FALSE, TRUE, 0);
+
g_signal_connect_swapped (window, "map",
G_CALLBACK (gtk_widget_grab_focus), priv->individual_view);
diff --git a/src/empathy-main-window.ui b/src/empathy-main-window.ui
index b21a07b..bab01c1 100644
--- a/src/empathy-main-window.ui
+++ b/src/empathy-main-window.ui
@@ -364,6 +364,19 @@
</packing>
</child>
<child>
+ <object class="GtkVBox" id="search_vbox">
+ <property name="visible">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkNotebook" id="notebook">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -395,7 +408,7 @@
</child>
</object>
<packing>
- <property name="position">5</property>
+ <property name="position">6</property>
</packing>
</child>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]