diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-10-18 21:22:46 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-10-18 21:22:46 +0800 |
| commit | 0446279dbf79a85718ca7a71bb6588d389ed15f5 (patch) | |
| tree | 5cca1866f7b2b40debd0e480bc6e99d632a8721a /libempathy-gtk | |
| parent | d91cd1d110fa660385574d3a9128b83287fc9a92 (diff) | |
| parent | b3a5b441b884c25198b77ae014cde3b73d396257 (diff) | |
| download | gsoc2013-empathy-0446279dbf79a85718ca7a71bb6588d389ed15f5.tar gsoc2013-empathy-0446279dbf79a85718ca7a71bb6588d389ed15f5.tar.gz gsoc2013-empathy-0446279dbf79a85718ca7a71bb6588d389ed15f5.tar.bz2 gsoc2013-empathy-0446279dbf79a85718ca7a71bb6588d389ed15f5.tar.lz gsoc2013-empathy-0446279dbf79a85718ca7a71bb6588d389ed15f5.tar.xz gsoc2013-empathy-0446279dbf79a85718ca7a71bb6588d389ed15f5.tar.zst gsoc2013-empathy-0446279dbf79a85718ca7a71bb6588d389ed15f5.zip | |
Merge remote branch 'vminko/fix-632024-v2'
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-individual-view.c | 19 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-individual-view.h | 2 |
2 files changed, 17 insertions, 4 deletions
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c index 2f2aae90a..2ad0fc0e0 100644 --- a/libempathy-gtk/empathy-individual-view.c +++ b/libempathy-gtk/empathy-individual-view.c @@ -1223,10 +1223,7 @@ individual_view_start_search_cb (EmpathyIndividualView *view, if (priv->search_widget == NULL) return FALSE; - if (gtk_widget_get_visible (GTK_WIDGET (priv->search_widget))) - gtk_widget_grab_focus (GTK_WIDGET (priv->search_widget)); - else - gtk_widget_show (GTK_WIDGET (priv->search_widget)); + empathy_individual_view_start_search (view); return TRUE; } @@ -2572,3 +2569,17 @@ empathy_individual_view_set_store (EmpathyIndividualView *self, G_CALLBACK (individual_view_store_row_deleted_cb), self, 0); } } + +void +empathy_individual_view_start_search (EmpathyIndividualView *self) +{ + EmpathyIndividualViewPriv *priv = GET_PRIV (self); + + g_return_if_fail (EMPATHY_IS_INDIVIDUAL_VIEW (self)); + g_return_if_fail (priv->search_widget != NULL); + + if (gtk_widget_get_visible (GTK_WIDGET (priv->search_widget))) + gtk_widget_grab_focus (GTK_WIDGET (priv->search_widget)); + else + gtk_widget_show (GTK_WIDGET (priv->search_widget)); +} diff --git a/libempathy-gtk/empathy-individual-view.h b/libempathy-gtk/empathy-individual-view.h index 94ec8ccfd..6d72e4d0c 100644 --- a/libempathy-gtk/empathy-individual-view.h +++ b/libempathy-gtk/empathy-individual-view.h @@ -130,5 +130,7 @@ EmpathyIndividualStore *empathy_individual_view_get_store ( void empathy_individual_view_set_store (EmpathyIndividualView *self, EmpathyIndividualStore *store); +void empathy_individual_view_start_search (EmpathyIndividualView *self); + G_END_DECLS #endif /* __EMPATHY_INDIVIDUAL_VIEW_H__ */ |