gnome-terminal r2832 - trunk/src

[chpe svn gnome org]

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

Log:
Use terminal_app_get_profile_for_new_term as fallback here, not the default profile.


Modified:
   trunk/src/terminal-window.c

Modified: trunk/src/terminal-window.c
==============================================================================
--- trunk/src/terminal-window.c	(original)
+++ trunk/src/terminal-window.c	Thu May 29 19:58:26 2008
@@ -2392,7 +2392,7 @@
 
   profile = g_object_get_data (G_OBJECT (action), PROFILE_DATA_KEY);
   if (!profile)
-    profile = terminal_app_get_default_profile (app);
+    profile = terminal_app_get_profile_for_new_term (app);
   if (!profile)
     return;
 
@@ -2412,7 +2412,7 @@
                              terminal_screen_get_working_dir (priv->active_screen),
                              1.0);
 
-  gtk_window_present_with_time (GTK_WINDOW (new_window), gtk_get_current_event_time ());
+  gtk_window_present (GTK_WINDOW (new_window));
 }
 
 static void
@@ -2420,18 +2420,20 @@
                        TerminalWindow *window)
 {
   TerminalWindowPrivate *priv = window->priv;
+  TerminalApp *app;
   TerminalProfile *profile;
 
+  app = terminal_app_get ();
   profile = g_object_get_data (G_OBJECT (action), PROFILE_DATA_KEY);
   if (!profile)
-    profile = terminal_app_get_default_profile (terminal_app_get ());
+    profile = terminal_app_get_profile_for_new_term (app);
   if (!profile)
     return;
 
   if (_terminal_profile_get_forgotten (profile))
     return;
 
-  terminal_app_new_terminal (terminal_app_get (), window, profile,
+  terminal_app_new_terminal (app, window, profile,
                              NULL, NULL,
                              terminal_screen_get_working_dir (priv->active_screen),
                              1.0);