gedit r6401 - in trunk: . gedit

[johan svn gnome org]

Author: johan
Date: Wed Aug 13 16:41:31 2008
New Revision: 6401
URL: http://svn.gnome.org/viewvc/gedit?rev=6401&view=rev

Log:
2008-08-13  Johan Dahlin  <johan gnome org>

    * gedit/gedit-session.c (save_window_session):
    Fix two warnings and merge problems.



Modified:
   trunk/ChangeLog
   trunk/gedit/gedit-session.c

Modified: trunk/gedit/gedit-session.c
==============================================================================
--- trunk/gedit/gedit-session.c	(original)
+++ trunk/gedit/gedit-session.c	Wed Aug 13 16:41:31 2008
@@ -77,9 +77,10 @@
 	GPtrArray *doc_array;
 	GeditDocument *active_document;
 	gchar *uri;
-	
+
 	gedit_debug (DEBUG_SESSION);
 
+    role = gtk_window_get_role (GTK_WINDOW (window));
 	g_key_file_set_string (state_file, group_name, "role", role);
 	gtk_window_get_size (GTK_WINDOW (window), &width, &height);
 	g_key_file_set_integer (state_file, group_name, "width", width);
@@ -120,7 +121,7 @@
  
 		g_key_file_set_string_list (state_file, group_name,
 					    "documents",
-					    (char **)doc_array->pdata,
+					    (const char **)doc_array->pdata,
 					    doc_array->len);
 		for (i = 0; i < doc_array->len; i++)
 		        g_free (doc_array->pdata[i]);