[vinagre] Refactored last Leandro's GtkBuilder patch.

[Jonh Wendell <jwendell src gnome org>]

commit eca3756df8058aaa71fbebf76a1a7bff8df7a9bd
Author: Jonh Wendell <jwendell gnome org>
Date:   Tue Jul 28 16:15:16 2009 -0300

    Refactored last Leandro's GtkBuilder patch.

 .gitignore                     |    2 +-
 plugins/vnc/vinagre-vnc-tab.c  |   11 +----------
 vinagre/vinagre-bookmarks-ui.c |   18 ++----------------
 vinagre/vinagre-connect.c      |    8 +-------
 vinagre/vinagre-prefs.c        |    9 +--------
 vinagre/vinagre-utils.c        |   20 ++++++++++++++++++++
 vinagre/vinagre-utils.h        |    1 +
 7 files changed, 27 insertions(+), 42 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7f4148a..925c2e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,7 +68,7 @@ vinagre/vinagre
 vinagre/vinagre-applet
 vinagre/vinagre-enums.*
 vinagre/vinagre-ui.xml
-vinagre/vinagre.glade
+vinagre/vinagre.ui
 vinagre/dbus-interface-glue.h
 stamp-h1
 xmldocs.make
diff --git a/plugins/vnc/vinagre-vnc-tab.c b/plugins/vnc/vinagre-vnc-tab.c
index e04a044..d3dfeef 100644
--- a/plugins/vnc/vinagre-vnc-tab.c
+++ b/plugins/vnc/vinagre-vnc-tab.c
@@ -415,7 +415,6 @@ ask_credential (VinagreVncTab *vnc_tab,
 		gchar         **password)
 {
   GtkBuilder      *xml;
-  const char      *ui_file;
   GtkWidget       *password_dialog, *host_label, *save_credential_check;
   GtkWidget       *password_label, *username_label, *image;
   gchar           *name, *label;
@@ -424,15 +423,7 @@ ask_credential (VinagreVncTab *vnc_tab,
   VinagreTab      *tab = VINAGRE_TAB (vnc_tab);
   VinagreConnection *conn = vinagre_tab_get_conn (tab);
 
-  ui_file = vinagre_utils_get_ui_filename ();
-  
-  GError* error = NULL;
-  xml = gtk_builder_new ();
-  if (!gtk_builder_add_from_file (xml, ui_file, &error))
-    {
-      g_warning (_("Couldn't load builder file: &s"), error->message);
-      g_error_free (error);
-    }
+  xml = vinagre_utils_get_builder ();
 
   password_dialog = GTK_WIDGET (gtk_builder_get_object (xml, "auth_required_dialog"));
   gtk_window_set_transient_for (GTK_WINDOW(password_dialog),
diff --git a/vinagre/vinagre-bookmarks-ui.c b/vinagre/vinagre-bookmarks-ui.c
index 0a57fd5..25ca19e 100644
--- a/vinagre/vinagre-bookmarks-ui.c
+++ b/vinagre/vinagre-bookmarks-ui.c
@@ -44,14 +44,7 @@ show_dialog_folder (VinagreBookmarks      *book,
   GtkWidget   *dialog, *box, *tree, *name_entry, *save_button;
   const gchar *name;
 
-  GError* error = NULL;
-  xml = gtk_builder_new ();
-  if (!gtk_builder_add_from_file (xml, vinagre_utils_get_ui_filename (), &error))
-    {
-      g_warning (_("Couldn't load builder file: &s"), error->message);
-      g_error_free (error);
-    }
-
+  xml = vinagre_utils_get_builder ();
   dialog     = GTK_WIDGET (gtk_builder_get_object (xml, "bookmarks_add_edit_folder_dialog"));
   name_entry = GTK_WIDGET (gtk_builder_get_object (xml, "edit_bookmark_folder_name_entry"));
   box        = GTK_WIDGET (gtk_builder_get_object (xml, "folder_box1"));
@@ -136,14 +129,7 @@ show_dialog_conn (VinagreBookmarks      *book,
   VinagrePlugin     *plugin;
   gchar             **props;
 
-  GError* error = NULL;
-  xml = gtk_builder_new ();
-  if (!gtk_builder_add_from_file (xml, vinagre_utils_get_ui_filename (), &error))
-    {
-      g_warning (_("Couldn't load builder file: &s"), error->message);
-      g_error_free (error);
-    }
-
+  xml = vinagre_utils_get_builder ();
   dialog         = GTK_WIDGET (gtk_builder_get_object (xml, "bookmarks_add_edit_conn_dialog"));
   name_entry     = GTK_WIDGET (gtk_builder_get_object (xml, "edit_bookmark_name_entry"));
   host_entry     = GTK_WIDGET (gtk_builder_get_object (xml, "edit_bookmark_host_entry"));
diff --git a/vinagre/vinagre-connect.c b/vinagre/vinagre-connect.c
index 86b8933..53c2573 100644
--- a/vinagre/vinagre-connect.c
+++ b/vinagre/vinagre-connect.c
@@ -365,13 +365,7 @@ VinagreConnection *vinagre_connect (VinagreWindow *window)
   gint                  result;
   VinagreConnectDialog  dialog;
 
-  GError* error = NULL;
-  dialog.xml = gtk_builder_new ();
-  if (!gtk_builder_add_from_file (dialog.xml, vinagre_utils_get_ui_filename (), &error))
-    {
-      g_warning (_("Couldn't load builder file: &s"), error->message);
-      g_error_free (error);
-    }
+  dialog.xml = vinagre_utils_get_builder ();
 
   dialog.dialog = GTK_WIDGET (gtk_builder_get_object (dialog.xml, "connect_dialog"));
   gtk_window_set_transient_for (GTK_WINDOW (dialog.dialog), GTK_WINDOW (window));
diff --git a/vinagre/vinagre-prefs.c b/vinagre/vinagre-prefs.c
index 8c003a3..cd9b8b7 100644
--- a/vinagre/vinagre-prefs.c
+++ b/vinagre/vinagre-prefs.c
@@ -529,14 +529,7 @@ vinagre_prefs_dialog_show (VinagreWindow *window)
 
   dialog = g_new (VinagrePrefsDialog, 1);
 
-  GError* error = NULL;
-  dialog->xml = gtk_builder_new ();
-  if (!gtk_builder_add_from_file (dialog->xml, vinagre_utils_get_ui_filename (), &error))
-    {
-      g_warning (_("Couldn't load builder file: &s"), error->message);
-      g_error_free (error);
-    }
-
+  dialog->xml = vinagre_utils_get_builder ();
   dialog->dialog = GTK_WIDGET (gtk_builder_get_object (dialog->xml, "preferences_dialog"));
   gtk_window_set_transient_for (GTK_WINDOW (dialog->dialog), GTK_WINDOW (window));
 
diff --git a/vinagre/vinagre-utils.c b/vinagre/vinagre-utils.c
index e6a5a56..c2b8a2d 100644
--- a/vinagre/vinagre-utils.c
+++ b/vinagre/vinagre-utils.c
@@ -136,6 +136,26 @@ vinagre_utils_get_ui_xml_filename (void)
     return VINAGRE_DATADIR "/" VINAGRE_UI_XML_FILE;
 }
 
+GtkBuilder *
+vinagre_utils_get_builder (void)
+{
+  GtkBuilder *xml;
+  GError     *error = NULL;
+
+  xml = gtk_builder_new ();
+  if (!gtk_builder_add_from_file (xml,
+				  vinagre_utils_get_ui_filename (),
+				  &error))
+    {
+      g_error (_("Could not load builder file: %s"), error->message);
+      g_error_free (error);
+      g_object_unref (xml);
+      return NULL;
+    }
+
+  return xml;
+}
+
 /*
  * Doubles underscore to avoid spurious menu accels.
  */
diff --git a/vinagre/vinagre-utils.h b/vinagre/vinagre-utils.h
index 4b5e04a..5b232db 100644
--- a/vinagre/vinagre-utils.h
+++ b/vinagre/vinagre-utils.h
@@ -45,6 +45,7 @@ void		vinagre_utils_toggle_widget_visible	(GtkWidget *widget);
 
 const gchar	*vinagre_utils_get_ui_filename		(void);
 const gchar	*vinagre_utils_get_ui_xml_filename	(void);
+GtkBuilder	*vinagre_utils_get_builder		(void);
 
 gchar		*vinagre_utils_escape_underscores	(const gchar *text,
 							 gssize      length);