gnome-build r615 - in trunk: . src/backends/libgbf_am src/backends/libgbf_mkfile src/gbf

[jhs svn gnome org]

Author: jhs
Date: Mon Sep  8 22:20:11 2008
New Revision: 615
URL: http://svn.gnome.org/viewvc/gnome-build?rev=615&view=rev

Log:
2008-09-09  Johannes Schmid  <jhs gnome org>

        Patch from Craig Keogh:
        * src/backends/libgbf_am/gbf-am-config.c
        (gbf_am_config_value_free), (gbf_am_config_value_copy):
        * src/backends/libgbf_am/gbf-am-project.c (parse_errors):
        * src/backends/libgbf_am/gbf-am-properties.c
        (on_project_widget_destroy), (on_group_widget_destroy),
        (on_target_widget_destroy):
        * src/backends/libgbf_mkfile/gbf-mkfile-config.c
        (gbf_mkfile_config_value_free), (gbf_mkfile_config_value_copy):
        * src/backends/libgbf_mkfile/gbf-mkfile-project.c 
(parse_errors):
        * src/backends/libgbf_mkfile/gbf-mkfile-properties.c
        (on_group_widget_destroy), (on_target_widget_destroy):
        * src/gbf/gbf-project-util.c (load_interface), (error_dialog):
        * src/gbf/test-project-view.c (main):
        #551069 â build failure: gbf-project-util.c:84: error: format 
not a string literal and no format arguments



Modified:
   trunk/ChangeLog
   trunk/src/backends/libgbf_am/gbf-am-config.c
   trunk/src/backends/libgbf_am/gbf-am-project.c
   trunk/src/backends/libgbf_am/gbf-am-properties.c
   trunk/src/backends/libgbf_mkfile/gbf-mkfile-config.c
   trunk/src/backends/libgbf_mkfile/gbf-mkfile-project.c
   trunk/src/backends/libgbf_mkfile/gbf-mkfile-properties.c
   trunk/src/gbf/gbf-project-util.c
   trunk/src/gbf/test-project-view.c

Modified: trunk/src/backends/libgbf_am/gbf-am-config.c
==============================================================================
--- trunk/src/backends/libgbf_am/gbf-am-config.c	(original)
+++ trunk/src/backends/libgbf_am/gbf-am-config.c	Mon Sep  8 22:20:11 2008
@@ -93,7 +93,7 @@
 		    }
 		    break;
 	    default:
-		    g_warning (_("Invalid GbfAmConfigValue type"));
+		    g_warning ("%s", _("Invalid GbfAmConfigValue type"));
 		    break;
 	}
 	g_free (value);
@@ -127,7 +127,7 @@
 		    value->list = g_slist_reverse (value->list);
 		    break;
 	    default:
-		    g_warning (_("Invalid GbfAmConfigValue type"));
+		    g_warning ("%s", _("Invalid GbfAmConfigValue type"));
 		    break;
 	}
 

Modified: trunk/src/backends/libgbf_am/gbf-am-project.c
==============================================================================
--- trunk/src/backends/libgbf_am/gbf-am-project.c	(original)
+++ trunk/src/backends/libgbf_am/gbf-am-project.c	Mon Sep  8 22:20:11 2008
@@ -1724,7 +1724,7 @@
 	if (message->len > 0) {
 		err = g_error_new (GBF_PROJECT_ERROR,
 				   GBF_PROJECT_ERROR_GENERAL_FAILURE,
-				   message->str);
+				   "%s", message->str);
 	}
 	g_string_free (message, TRUE);
 	

Modified: trunk/src/backends/libgbf_am/gbf-am-properties.c
==============================================================================
--- trunk/src/backends/libgbf_am/gbf-am-properties.c	(original)
+++ trunk/src/backends/libgbf_am/gbf-am-properties.c	Mon Sep  8 22:20:11 2008
@@ -194,7 +194,8 @@
 				   G_DIR_SEPARATOR, getpid());
 	pkg_cmd = g_strconcat ("pkg-config --list-all 2>/dev/null | sort > ",
 			       tmpfile, NULL);
-	system (pkg_cmd);
+	if (system (pkg_cmd) == -1)
+		return store;
 	pkg_fd = fopen (tmpfile, "r");
 	if (!pkg_fd) {
 		g_warning ("Can not open %s for reading", tmpfile);
@@ -751,7 +752,7 @@
 	GbfAmConfigMapping *new_config = g_object_get_data (G_OBJECT (top_level), "__config");
 	gbf_am_project_set_config (project, new_config, &err);
 	if (err) {
-		g_warning (err->message);
+		g_warning ("%s", err->message);
 		g_error_free (err);
 	}
 	g_object_unref (top_level);
@@ -1249,7 +1250,7 @@
 	const gchar *group_id = g_object_get_data (G_OBJECT (table), "__group_id");
 	gbf_am_project_set_group_config (project, group_id, new_config, &err);
 	if (err) {
-		g_warning (err->message);
+		g_warning ("%s", err->message);
 		g_error_free (err);
 	}
 	g_object_unref (table);
@@ -1364,13 +1365,13 @@
 	const gchar *group_id = g_object_get_data (G_OBJECT (table), "__group_id");
 	gbf_am_project_set_target_config (project, target_id, new_config, &err);
 	if (err) {
-		g_warning (err->message);
+		g_warning ("%s", err->message);
 		g_error_free (err);
 	}
 	err = NULL;
 	gbf_am_project_set_group_config (project, group_id, new_group_config, &err);
 	if (err) {
-		g_warning (err->message);
+		g_warning ("%s", err->message);
 		g_error_free (err);
 	}
 	g_object_unref (table);

Modified: trunk/src/backends/libgbf_mkfile/gbf-mkfile-config.c
==============================================================================
--- trunk/src/backends/libgbf_mkfile/gbf-mkfile-config.c	(original)
+++ trunk/src/backends/libgbf_mkfile/gbf-mkfile-config.c	Mon Sep  8 22:20:11 2008
@@ -99,7 +99,7 @@
 		    }
 		    break;
 	    default:
-		    g_warning (_("Invalid GbfMkfileConfigValue type"));
+		    g_warning ("%s", _("Invalid GbfMkfileConfigValue type"));
 		    break;
 	}
 	g_free (value);
@@ -133,7 +133,7 @@
 		    value->list = g_slist_reverse (value->list);
 		    break;
 	    default:
-		    g_warning (_("Invalid GbfMkfileConfigValue type"));
+		    g_warning ("%s", _("Invalid GbfMkfileConfigValue type"));
 		    break;
 	}
 

Modified: trunk/src/backends/libgbf_mkfile/gbf-mkfile-project.c
==============================================================================
--- trunk/src/backends/libgbf_mkfile/gbf-mkfile-project.c	(original)
+++ trunk/src/backends/libgbf_mkfile/gbf-mkfile-project.c	Mon Sep  8 22:20:11 2008
@@ -1687,7 +1687,7 @@
 	if (message->len > 0) {
 		err = g_error_new (GBF_PROJECT_ERROR,
 				   GBF_PROJECT_ERROR_GENERAL_FAILURE,
-				   message->str);
+				   "%s", message->str);
 	}
 	g_string_free (message, TRUE);
 	

Modified: trunk/src/backends/libgbf_mkfile/gbf-mkfile-properties.c
==============================================================================
--- trunk/src/backends/libgbf_mkfile/gbf-mkfile-properties.c	(original)
+++ trunk/src/backends/libgbf_mkfile/gbf-mkfile-properties.c	Mon Sep  8 22:20:11 2008
@@ -197,7 +197,7 @@
 	gbf_mkfile_project_set_group_config (project, group_id, new_config, &err);
 	if (err)
 	{
-		g_warning (err->message);
+		g_warning ("%s", err->message);
 		g_error_free (err);
 	}
 	g_object_unref (table);
@@ -292,7 +292,7 @@
 	gbf_mkfile_project_set_target_config (project, target_id, new_config, &err);
 	if (err)
 	{
-		g_warning (err->message);
+		g_warning ("%s", err->message);
 		g_error_free (err);
 	}
 	g_object_unref (table);

Modified: trunk/src/gbf/gbf-project-util.c
==============================================================================
--- trunk/src/gbf/gbf-project-util.c	(original)
+++ trunk/src/gbf/gbf-project-util.c	Mon Sep  8 22:20:11 2008
@@ -81,7 +81,7 @@
     xml = glade_xml_new (GLADE_FILE, top_widget, GETTEXT_PACKAGE);
 
     if (!xml) {
-        g_warning (_("Couldn't load glade file"));
+        g_warning ("%s", _("Couldn't load glade file"));
         return NULL;
     }
     
@@ -166,7 +166,7 @@
 						 GTK_DIALOG_DESTROY_WITH_PARENT,
 						 GTK_MESSAGE_ERROR,
 						 GTK_BUTTONS_OK,
-						 message);
+						 "%s", message);
     g_free (tmp);
     g_free (message);
     

Modified: trunk/src/gbf/test-project-view.c
==============================================================================
--- trunk/src/gbf/test-project-view.c	(original)
+++ trunk/src/gbf/test-project-view.c	Mon Sep  8 22:20:11 2008
@@ -312,7 +312,7 @@
 			    GNOME_PARAM_NONE);
 
 	if (!bonobo_init (&argc, argv))
-		g_error (_("Can't initialize bonobo!"));
+		g_error ("%s", _("Can't initialize bonobo!"));
 
 	app = GTK_WIDGET (create_window ());