From: Xavier Claessens Date: Mon, 8 Jul 2013 10:06:48 +0000 (+0200) Subject: EmpathyContactSearchDialog: factor out append_message_page() X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=bda80eccdf3e79c195bfa7982a9955c401e31c48 EmpathyContactSearchDialog: factor out append_message_page() https://bugzilla.gnome.org/show_bug.cgi?id=703775 --- diff --git a/libempathy-gtk/empathy-contact-search-dialog.c b/libempathy-gtk/empathy-contact-search-dialog.c index 2696f5ab..90c61dfb 100644 --- a/libempathy-gtk/empathy-contact-search-dialog.c +++ b/libempathy-gtk/empathy-contact-search-dialog.c @@ -69,7 +69,6 @@ struct _EmpathyContactSearchDialogPrivate GtkWidget *spinner; GtkWidget *add_button; GtkWidget *find_button; - GtkWidget *no_contact_found; GtkWidget *search_entry; /* GtkWidget *server_entry; */ GtkWidget *message; @@ -506,6 +505,24 @@ on_profile_button_clicked_cb (EmpathyCellRendererActivatable *cell, g_object_unref (factory); } +static void +append_message_page (EmpathyContactSearchDialog *self, + const gchar *message) +{ + EmpathyContactSearchDialogPrivate *priv = GET_PRIVATE (self); + GtkWidget *label; + gchar *tmp; + + label = gtk_label_new (NULL); + tmp = g_strdup_printf ("%s", message); + gtk_label_set_markup (GTK_LABEL (label), tmp); + g_free (tmp); + + gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); + + gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), label, NULL); +} + static void empathy_contact_search_dialog_init (EmpathyContactSearchDialog *self) { @@ -515,7 +532,6 @@ empathy_contact_search_dialog_init (EmpathyContactSearchDialog *self) GtkTreeViewColumn *col; GtkTreeSelection *selection; GtkSizeGroup *size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); - gchar *tmp; /* Title */ gtk_window_set_title (GTK_WINDOW (self), _("Search contacts")); @@ -622,19 +638,10 @@ empathy_contact_search_dialog_init (EmpathyContactSearchDialog *self) gtk_container_add (GTK_CONTAINER (scrolled_window), priv->tree_view); - priv->no_contact_found = gtk_label_new (NULL); - tmp = g_strdup_printf ("%s", - _("No contacts found")); - gtk_label_set_markup (GTK_LABEL (priv->no_contact_found), tmp); - g_free (tmp); - - gtk_label_set_ellipsize (GTK_LABEL (priv->no_contact_found), - PANGO_ELLIPSIZE_END); - gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), scrolled_window, NULL); - gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), - priv->no_contact_found, NULL); + + append_message_page (self, _("No contacts found")); gtk_box_pack_start (GTK_BOX (vbox), priv->notebook, TRUE, TRUE, 3);