gyrus r372 - in trunk: . src

[csaavedra svn gnome org]

Author: csaavedra
Date: Mon Feb 23 19:07:06 2009
New Revision: 372
URL: http://svn.gnome.org/viewvc/gyrus?rev=372&view=rev

Log:
2009-02-23  Claudio Saavedra  <csaavedra igalia com>

	* src/gyrus-admin.c: (gyrus_admin_init_get_widgets):
	* src/gyrus-common.c: (gyrus_dialog_password_new):
	* src/gyrus-dialog-find-mailbox.c:
	(gyrus_dialog_find_mailbox_init_get_widgets):
	* src/gyrus-dialog-mailbox-new.c:
	(gyrus_dialog_mailbox_new_init_get_widgets):
	* src/gyrus-preferences.c: (gyrus_preferences_show_dialog):
	* src/gyrus-report.c: (gyrus_report_show_report):
	* src/gyrus-session.c: (gyrus_session_load_interface),
	(gyrus_session_edit_load_interface):

	Use g_build_filename() instead of g_strdup_printf() to build the
	filename for the glade files.



Modified:
   trunk/ChangeLog
   trunk/src/gyrus-admin.c
   trunk/src/gyrus-common.c
   trunk/src/gyrus-dialog-find-mailbox.c
   trunk/src/gyrus-dialog-mailbox-new.c
   trunk/src/gyrus-preferences.c
   trunk/src/gyrus-report.c
   trunk/src/gyrus-session.c

Modified: trunk/src/gyrus-admin.c
==============================================================================
--- trunk/src/gyrus-admin.c	(original)
+++ trunk/src/gyrus-admin.c	Mon Feb 23 19:07:06 2009
@@ -170,8 +170,7 @@
 	gchar *file_glade;
 	GtkWidget *table;
 
-	file_glade = g_strdup_printf ("%s%c%s", GYRUS_GLADE_DIR,
-				      G_DIR_SEPARATOR, "page.glade");
+	file_glade = g_build_filename (GYRUS_GLADE_DIR, "page.glade", NULL);
 	xml_page = glade_xml_new (file_glade, "table_page", "gyrus");
 	
 	g_free (file_glade);

Modified: trunk/src/gyrus-common.c
==============================================================================
--- trunk/src/gyrus-common.c	(original)
+++ trunk/src/gyrus-common.c	Mon Feb 23 19:07:06 2009
@@ -72,8 +72,7 @@
 	gchar *password = NULL;
 	gint result;
 
-	file_glade = g_strdup_printf ("%s%c%s", GYRUS_GLADE_DIR,
-				      G_DIR_SEPARATOR, "page.glade");
+	file_glade = g_build_filename (GYRUS_GLADE_DIR, "page.glade", NULL);
 	xml = glade_xml_new (file_glade, "dialog_password", "gyrus");
 	g_free (file_glade);
 	

Modified: trunk/src/gyrus-dialog-find-mailbox.c
==============================================================================
--- trunk/src/gyrus-dialog-find-mailbox.c	(original)
+++ trunk/src/gyrus-dialog-find-mailbox.c	Mon Feb 23 19:07:06 2009
@@ -211,8 +211,7 @@
 	gchar *file_glade;
 	GtkWidget *vbox_find;
 
-	file_glade = g_strdup_printf ("%s%c%s", GYRUS_GLADE_DIR,
-				      G_DIR_SEPARATOR, "find.glade");
+	file_glade = g_build_filename (GYRUS_GLADE_DIR, "find.glade", NULL);
 	xml_dialog = glade_xml_new (file_glade, "vbox_find", "gyrus");
 	g_free (file_glade);
 

Modified: trunk/src/gyrus-dialog-mailbox-new.c
==============================================================================
--- trunk/src/gyrus-dialog-mailbox-new.c	(original)
+++ trunk/src/gyrus-dialog-mailbox-new.c	Mon Feb 23 19:07:06 2009
@@ -163,8 +163,7 @@
 	gchar *file_glade;
 	GtkWidget *table;
 
-	file_glade = g_strdup_printf ("%s%c%s", GYRUS_GLADE_DIR,
-				      G_DIR_SEPARATOR, "create_mailbox.glade");
+	file_glade = g_build_filename (GYRUS_GLADE_DIR, "create_mailbox.glade", NULL);
 	xml_dialog = glade_xml_new (file_glade, "table_dialog", "gyrus");
 	g_free (file_glade);
 

Modified: trunk/src/gyrus-preferences.c
==============================================================================
--- trunk/src/gyrus-preferences.c	(original)
+++ trunk/src/gyrus-preferences.c	Mon Feb 23 19:07:06 2009
@@ -35,8 +35,7 @@
        	gchar *file_glade;
 	GtkWidget *window_preferences;
 
-	file_glade = g_strdup_printf ("%s%c%s", GYRUS_GLADE_DIR,
-				      G_DIR_SEPARATOR, "preferences.glade");
+	file_glade = g_build_filename (GYRUS_GLADE_DIR, "preferences.glade", NULL);
 	xml = glade_xml_new (file_glade, NULL, NULL);
 
 	window_preferences = glade_xml_get_widget (xml, "preferences");

Modified: trunk/src/gyrus-report.c
==============================================================================
--- trunk/src/gyrus-report.c	(original)
+++ trunk/src/gyrus-report.c	Mon Feb 23 19:07:06 2009
@@ -89,8 +89,7 @@
 	report->mailbox_temp = NULL;
 	report->admin = admin;
 	
-	file_glade = g_strdup_printf ("%s%c%s", GYRUS_GLADE_DIR,
-				      G_DIR_SEPARATOR, "report.glade");
+	file_glade = g_build_filename (GYRUS_GLADE_DIR, "report.glade", NULL);
 	xml = glade_xml_new (file_glade, NULL, NULL);
 
 	report->window_report = glade_xml_get_widget (xml, "window-report");

Modified: trunk/src/gyrus-session.c
==============================================================================
--- trunk/src/gyrus-session.c	(original)
+++ trunk/src/gyrus-session.c	Mon Feb 23 19:07:06 2009
@@ -712,8 +712,7 @@
 	GladeXML *xml;
 	gchar *file_glade;
         
-	file_glade = g_strdup_printf ("%s%c%s", GYRUS_GLADE_DIR,
-				      G_DIR_SEPARATOR, "sessions.glade");
+	file_glade = g_build_filename (GYRUS_GLADE_DIR, "sessions.glade", NULL);
 	xml = glade_xml_new (file_glade, "dialog_sessions", "gyrus");
 	g_free (file_glade);
 	
@@ -771,8 +770,7 @@
 	GladeXML *xml;
 	gchar *file_glade;
         
-	file_glade = g_strdup_printf ("%s%c%s", GYRUS_GLADE_DIR,
-				      G_DIR_SEPARATOR, "sessions.glade");
+	file_glade = g_build_filename (GYRUS_GLADE_DIR, "sessions.glade", NULL);
 	xml = glade_xml_new (file_glade, "dialog_session_edit", "gyrus");
 	g_free (file_glade);