[nautilus-actions] Set more secure compilation option

[Pierre Wieser <pwieser src gnome org>]

commit 4cc79a2135446cdfd1ba858d6fd6b60f57a98147
Author: Pierre Wieser <pwieser trychlos org>
Date:   Tue Jan 5 20:08:45 2010 +0100

    Set more secure compilation option

 ChangeLog                                    |   17 +++++++++++++++++
 configure.ac                                 |    2 +-
 nautilus-actions/nact/nact-gtk-utils.c       |    2 +-
 nautilus-actions/nact/nact-iactions-list.c   |    2 +-
 nautilus-actions/nact/nact-iadvanced-tab.c   |    6 +++---
 nautilus-actions/nact/nact-ibackground-tab.c |    2 +-
 nautilus-actions/runtime/na-xml-writer.c     |    6 +++---
 7 files changed, 27 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a9cac9b..65c5c7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2009-01-05 Pierre Wieser <pwieser trychlos org>
+
+	* configure.ac: Add -Wformat=2 compilation option.
+
+	* nautilus-actions/nact/nact-gtk-utils.c (nact_gtk_utils_set_editable):
+	* nautilus-actions/nact/nact-iactions-list.c
+	(nact_iactions_list_runtime_init_toplevel):
+	* nautilus-actions/nact/nact-iadvanced-tab.c
+	(runtime_init_connect_signals):
+	* nautilus-actions/nact/nact-ibackground-tab.c
+	(nact_ibackground_tab_runtime_init_toplevel):
+	Substitute gtk_cell_layout_get_cells to obsoleted
+	gtk_tree_view_column_get_cell_renderers.
+
+	* nautilus-actions/runtime/na-xml-writer.c (na_xml_writer_output_xml):
+	Use correct printf format.
+
 2009-12-22 Pierre Wieser <pwieser trychlos org>
 
 	Make the toolbars detacheable.
diff --git a/configure.ac b/configure.ac
index 0a90917..f82d52e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,7 +84,7 @@ AC_PROG_MAKE_SET
 # Gnome stuff
 GNOME_COMMON_INIT
 GNOME_MAINTAINER_MODE_DEFINES
-NA_GNOME_COMPILE_WARNINGS([error],[-ansi -Wno-overlength-strings])
+NA_GNOME_COMPILE_WARNINGS([error],[-ansi -Wno-overlength-strings -Wformat=2])
 AC_SUBST([AM_CPPFLAGS],["${AM_CPPFLAGS} ${DISABLE_DEPRECATED}"])
 # unique 1.0.8 doesn't satisfy this
 #AC_SUBST([AM_CPPFLAGS],["${AM_CPPFLAGS} \
diff --git a/nautilus-actions/nact/nact-gtk-utils.c b/nautilus-actions/nact/nact-gtk-utils.c
index 42df3f6..00d90a8 100644
--- a/nautilus-actions/nact/nact-gtk-utils.c
+++ b/nautilus-actions/nact/nact-gtk-utils.c
@@ -74,7 +74,7 @@ nact_gtk_utils_set_editable( GtkObject *widget, gboolean editable )
 		gtk_combo_box_set_button_sensitivity( GTK_COMBO_BOX( widget ), editable ? GTK_SENSITIVITY_ON : GTK_SENSITIVITY_OFF );
 
 	} else if( GTK_IS_TREE_VIEW_COLUMN( widget )){
-		renderers = gtk_tree_view_column_get_cell_renderers( GTK_TREE_VIEW_COLUMN( widget ));
+		renderers = gtk_cell_layout_get_cells( GTK_CELL_LAYOUT( GTK_TREE_VIEW_COLUMN( widget )));
 		for( irender = renderers ; irender ; irender = irender->next ){
 			if( GTK_IS_CELL_RENDERER_TEXT( irender->data )){
 				g_object_set( G_OBJECT( irender->data ), "editable", editable, "editable-set", TRUE, NULL );
diff --git a/nautilus-actions/nact/nact-iactions-list.c b/nautilus-actions/nact/nact-iactions-list.c
index 92a4365..2ab917e 100644
--- a/nautilus-actions/nact/nact-iactions-list.c
+++ b/nautilus-actions/nact/nact-iactions-list.c
@@ -472,7 +472,7 @@ nact_iactions_list_runtime_init_toplevel( NactIActionsList *instance, GList *ite
 
 		/* label edition: inform the corresponding tab */
 		column = gtk_tree_view_get_column( treeview, IACTIONS_LIST_LABEL_COLUMN );
-		renderers = gtk_tree_view_column_get_cell_renderers( column );
+		renderers = gtk_cell_layout_get_cells( GTK_CELL_LAYOUT( column ));
 		base_window_signal_connect(
 				BASE_WINDOW( instance ),
 				G_OBJECT( renderers->data ),
diff --git a/nautilus-actions/nact/nact-iadvanced-tab.c b/nautilus-actions/nact/nact-iadvanced-tab.c
index 92238ed..4e43777 100644
--- a/nautilus-actions/nact/nact-iadvanced-tab.c
+++ b/nautilus-actions/nact/nact-iadvanced-tab.c
@@ -269,7 +269,7 @@ runtime_init_connect_signals( NactIAdvancedTab *instance, GtkTreeView *listview
 	if( st_initialized && !st_finalized ){
 
 		column = gtk_tree_view_get_column( listview, SCHEMES_CHECKBOX_COLUMN );
-		renderers = gtk_tree_view_column_get_cell_renderers( column );
+		renderers = gtk_cell_layout_get_cells( GTK_CELL_LAYOUT( column ));
 		base_window_signal_connect(
 				BASE_WINDOW( instance ),
 				G_OBJECT( renderers->data ),
@@ -277,7 +277,7 @@ runtime_init_connect_signals( NactIAdvancedTab *instance, GtkTreeView *listview
 				G_CALLBACK( on_scheme_selection_toggled ));
 
 		column = gtk_tree_view_get_column( listview, SCHEMES_KEYWORD_COLUMN );
-		renderers = gtk_tree_view_column_get_cell_renderers( column );
+		renderers = gtk_cell_layout_get_cells( GTK_CELL_LAYOUT( column ));
 		base_window_signal_connect(
 				BASE_WINDOW( instance ),
 				G_OBJECT( renderers->data ),
@@ -285,7 +285,7 @@ runtime_init_connect_signals( NactIAdvancedTab *instance, GtkTreeView *listview
 				G_CALLBACK( on_scheme_keyword_edited ));
 
 		column = gtk_tree_view_get_column( listview, SCHEMES_DESC_COLUMN );
-		renderers = gtk_tree_view_column_get_cell_renderers( column );
+		renderers = gtk_cell_layout_get_cells( GTK_CELL_LAYOUT( column ));
 		base_window_signal_connect(
 				BASE_WINDOW( instance ),
 				G_OBJECT( renderers->data ),
diff --git a/nautilus-actions/nact/nact-ibackground-tab.c b/nautilus-actions/nact/nact-ibackground-tab.c
index b58f86f..7e603c0 100644
--- a/nautilus-actions/nact/nact-ibackground-tab.c
+++ b/nautilus-actions/nact/nact-ibackground-tab.c
@@ -225,7 +225,7 @@ nact_ibackground_tab_runtime_init_toplevel( NactIBackgroundTab *instance )
 
 		listview = get_folders_treeview( instance );
 		column = gtk_tree_view_get_column( listview, BACKGROUND_URI_COLUMN );
-		renderers = gtk_tree_view_column_get_cell_renderers( column );
+		renderers = gtk_cell_layout_get_cells( GTK_CELL_LAYOUT( column ));
 		base_window_signal_connect(
 				BASE_WINDOW( instance ),
 				G_OBJECT( renderers->data ),
diff --git a/nautilus-actions/runtime/na-xml-writer.c b/nautilus-actions/runtime/na-xml-writer.c
index 9abbd74..b79f422 100644
--- a/nautilus-actions/runtime/na-xml-writer.c
+++ b/nautilus-actions/runtime/na-xml-writer.c
@@ -508,7 +508,7 @@ na_xml_writer_output_xml( const gchar *xml, const gchar *filename, GSList **msg
 	stream = g_file_replace( file, NULL, FALSE, G_FILE_CREATE_NONE, NULL, &error );
 	if( error ){
 		errmsg = g_strdup_printf( "%s: g_file_replace: %s", thisfn, error->message );
-		g_warning( errmsg );
+		g_warning( "%s", errmsg );
 		*msg = g_slist_append( *msg, errmsg );
 		g_error_free( error );
 		if( stream ){
@@ -521,7 +521,7 @@ na_xml_writer_output_xml( const gchar *xml, const gchar *filename, GSList **msg
 	g_output_stream_write( G_OUTPUT_STREAM( stream ), xml, g_utf8_strlen( xml, -1 ), NULL, &error );
 	if( error ){
 		errmsg = g_strdup_printf( "%s: g_output_stream_write: %s", thisfn, error->message );
-		g_warning( errmsg );
+		g_warning( "%s", errmsg );
 		*msg = g_slist_append( *msg, errmsg );
 		g_error_free( error );
 		g_object_unref( stream );
@@ -532,7 +532,7 @@ na_xml_writer_output_xml( const gchar *xml, const gchar *filename, GSList **msg
 	g_output_stream_close( G_OUTPUT_STREAM( stream ), NULL, &error );
 	if( error ){
 		errmsg = g_strdup_printf( "%s: g_output_stream_close: %s", thisfn, error->message );
-		g_warning( errmsg );
+		g_warning( "%s", errmsg );
 		*msg = g_slist_append( *msg, errmsg );
 		g_error_free( error );
 		g_object_unref( stream );