[nautilus-actions] Minor bug fixes

[Pierre Wieser <pwieser src gnome org>]

commit 3bb8a15b66460a44df9a5a8d93498a5ccdfd4b2c
Author: Pierre Wieser <pwieser trychlos org>
Date:   Mon Oct 19 06:49:02 2009 +0200

    Minor bug fixes
    
    Do not resize window with unset default width and heigth.
    Do not omit newline when concatenating prefixed strings.
    Use XML markup for managing XML messages.

 ChangeLog                        |    9 +++++++++
 src/common/na-utils.c            |    2 +-
 src/nact/base-iprefs.c           |    9 +++------
 src/nact/nact-assistant-import.c |    1 +
 src/nact/nact-xml-reader.c       |    2 +-
 5 files changed, 15 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d90bb08..f5f084b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2009-10-19 Pierre Wieser <pwieser trychlos org>
 
+	* src/common/na-utils.c (na_utils_prefix_strings):
+	Fix concatenation of prefixed strings.
+
+	* src/nact/base-iprefs.c (base_iprefs_position_named_window):
+	Do not resize the window with unset default width and height.
+
+	* src/nact/nact-xml-reader.c (add_message):
+	Consider messages embedding XML markup.
+
 	* src/common/na-object-id.c (na_object_id_prepare_for_paste):
 	Recursively manage menu subitems.
 
diff --git a/src/common/na-utils.c b/src/common/na-utils.c
index d0852de..2f15187 100644
--- a/src/common/na-utils.c
+++ b/src/common/na-utils.c
@@ -326,7 +326,7 @@ na_utils_prefix_strings( const gchar *prefix, const gchar *str )
 	result = g_string_new( "" );
 
 	for( il = list ; il ; il = il->next ){
-		g_string_append_printf( result, "%s%s", prefix, ( gchar * ) il->data );
+		g_string_append_printf( result, "%s%s\n", prefix, ( gchar * ) il->data );
 	}
 
 	na_utils_free_string_list( list );
diff --git a/src/nact/base-iprefs.c b/src/nact/base-iprefs.c
index 701ad91..4096cc1 100644
--- a/src/nact/base-iprefs.c
+++ b/src/nact/base-iprefs.c
@@ -200,13 +200,10 @@ base_iprefs_position_named_window( BaseWindow *window, GtkWindow *toplevel, cons
 			screen_width = gdk_screen_get_width( screen );
 			screen_height = gdk_screen_get_height( screen );
 
-			if(( x+width > screen_width ) ||
-				( y+height > screen_height )){
-				gtk_window_get_default_size( toplevel, &width, &height );
+			if(( x+width < screen_width ) && ( y+height < screen_height )){
+				gtk_window_move( toplevel, x, y );
+				gtk_window_resize( toplevel, width, height );
 			}
-
-			gtk_window_move( toplevel, x, y );
-			gtk_window_resize( toplevel, width, height );
 		}
 	}
 }
diff --git a/src/nact/nact-assistant-import.c b/src/nact/nact-assistant-import.c
index 071c2f9..ac60242 100644
--- a/src/nact/nact-assistant-import.c
+++ b/src/nact/nact-assistant-import.c
@@ -760,6 +760,7 @@ prepare_importdone( NactAssistantImport *window, GtkAssistant *assistant, GtkWid
 		text = tmp;
 	}
 
+	/*g_debug( "%s: text='%s'", thisfn, text );*/
 	gtk_label_set_markup( GTK_LABEL( page ), text );
 	g_free( text );
 
diff --git a/src/nact/nact-xml-reader.c b/src/nact/nact-xml-reader.c
index 1938e80..10bed94 100644
--- a/src/nact/nact-xml-reader.c
+++ b/src/nact/nact-xml-reader.c
@@ -1174,7 +1174,7 @@ add_message( NactXMLReader *reader, const gchar *format, ... )
 	g_debug( "nact_xml_reader_add_message: format=%s", format );
 
 	va_start( va, format );
-	tmp = g_strdup_vprintf( format, va );
+	tmp = g_markup_vprintf_escaped( format, va );
 	va_end( va );
 	reader->private->messages = g_slist_append( reader->private->messages, tmp );
 }