From ab97f58c9a4bf3b0230693f09c76e6de5a23d3fe Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Fri, 27 Aug 2010 10:00:27 +0200 Subject: no need to use a #define --- src/empathy-main-window.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/empathy-main-window.c') diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index 0efa4a97d..381f2fd7a 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -91,9 +91,6 @@ /* Name in the geometry file */ #define GEOMETRY_NAME "main-window" -/* Labels for empty contact list */ -#define NO_MATCH_FOUND _("No match found") - G_DEFINE_TYPE (EmpathyMainWindow, empathy_main_window, GTK_TYPE_WINDOW); #define GET_PRIV(self) ((EmpathyMainWindowPriv *)((EmpathyMainWindow *) self)->priv) @@ -376,7 +373,8 @@ main_window_row_deleted_cb (GtkTreeModel *model, if (empathy_individual_view_is_searching ( priv->individual_view)) { gtk_label_set_text (GTK_LABEL (priv->no_entry_label), - NO_MATCH_FOUND); + _("No match found")); + gtk_notebook_set_current_page ( GTK_NOTEBOOK (priv->notebook), 0); -- cgit v1.2.3 From 7c95784276fa35bb9d0c91189ebfbb8be50f6564 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Fri, 27 Aug 2010 10:02:42 +0200 Subject: Increase the size of the 'No Match Found' label It looks less crap that way. --- src/empathy-main-window.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/empathy-main-window.c') diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index 381f2fd7a..9cbf61811 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -372,8 +372,13 @@ main_window_row_deleted_cb (GtkTreeModel *model, if (empathy_individual_view_is_searching ( priv->individual_view)) { - gtk_label_set_text (GTK_LABEL (priv->no_entry_label), - _("No match found")); + gchar *tmp; + + tmp = g_strdup_printf ("%s", + _("No match found")); + + gtk_label_set_markup (GTK_LABEL (priv->no_entry_label), tmp); + g_free (tmp); gtk_notebook_set_current_page ( GTK_NOTEBOOK (priv->notebook), -- cgit v1.2.3 From 750400297f05dd45369f2bb77c7a351c4561a585 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Fri, 27 Aug 2010 10:05:28 +0200 Subject: main-window: define an enum for pages --- src/empathy-main-window.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/empathy-main-window.c') diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index 9cbf61811..5f9767639 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -91,6 +91,11 @@ /* Name in the geometry file */ #define GEOMETRY_NAME "main-window" +enum { + PAGE_NO_MATCH = 0, + PAGE_CONTACT_LIST +}; + G_DEFINE_TYPE (EmpathyMainWindow, empathy_main_window, GTK_TYPE_WINDOW); #define GET_PRIV(self) ((EmpathyMainWindowPriv *)((EmpathyMainWindow *) self)->priv) @@ -381,8 +386,7 @@ main_window_row_deleted_cb (GtkTreeModel *model, g_free (tmp); gtk_notebook_set_current_page ( - GTK_NOTEBOOK (priv->notebook), - 0); + GTK_NOTEBOOK (priv->notebook), PAGE_NO_MATCH); } } } @@ -398,7 +402,7 @@ main_window_row_inserted_cb (GtkTreeModel *model, if (priv->empty) { priv->empty = FALSE; gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), - 1); + PAGE_CONTACT_LIST); gtk_widget_grab_focus (GTK_WIDGET (priv->individual_view)); } } -- cgit v1.2.3