gnome-terminal r2692 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Thu May 29 19:45:43 2008
New Revision: 2692
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2692&view=rev

Log:
If getting the default profile key fails, use the fallback profile name.


Modified:
   trunk/src/terminal-app.c

Modified: trunk/src/terminal-app.c
==============================================================================
--- trunk/src/terminal-app.c	(original)
+++ trunk/src/terminal-app.c	Thu May 29 19:45:43 2008
@@ -858,18 +858,16 @@
 {
   TerminalApp *app = TERMINAL_APP (user_data);
   GConfValue *val;
-  const char *name;
+  const char *name = NULL;
   
   app->default_profile_locked = !gconf_entry_get_is_writable (entry);
 
   val = gconf_entry_get_value (entry);  
-  if (val == NULL ||
-      val->type != GCONF_VALUE_STRING)
-    return;
-  
-  name = gconf_value_get_string (val);
+  if (val != NULL &&
+      val->type == GCONF_VALUE_STRING)
+    name = gconf_value_get_string (val);
   if (!name)
-    name = FALLBACK_PROFILE_ID; /* FIXMEchpe? */
+    name = FALLBACK_PROFILE_ID;
 
   g_free (app->default_profile_id);
   app->default_profile_id = g_strdup (name);
@@ -1652,8 +1650,6 @@
     
       terminal_window_add_screen (window, screen, -1);
 
-//       terminal_screen_reread_profile (screen); FIXMEchpe this should be obsolete by the set_profile above
-    
       terminal_window_set_active (window, screen);
       gtk_widget_grab_focus (GTK_WIDGET (screen));
     }
@@ -1749,7 +1745,6 @@
   return g_list_last (app->windows)->data;
 }
 
-/* FIXMEchpe: make this list contain ref'd objects */
 /**
  * terminal_profile_get_list:
  *