gnome-terminal r2795 - trunk/src

[chpe svn gnome org]

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

Log:
For, not while.


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:55:01 2008
@@ -1186,7 +1186,7 @@
                                 int         *argcp,
                                 char      ***argvp)
 {
-  GList *tmp;
+  GList *lw;
   GPtrArray* args;
   
   args = g_ptr_array_new ();
@@ -1194,26 +1194,22 @@
    g_ptr_array_add (args, g_strdup (EXECUTABLE_NAME));
 
   if (!app->use_factory)
-    {
-       g_ptr_array_add (args, g_strdup ("--disable-factory"));
-    }
+    g_ptr_array_add (args, g_strdup ("--disable-factory"));
 
-  tmp = app->windows;
-  while (tmp != NULL)
+  for (lw = app->windows; l != NULL; l = l->next)
     {
       GList *tabs;
-      GList *tmp2;
-      TerminalWindow *window = tmp->data;
+      GList *lt;
+      TerminalWindow *window = lw->data;
       TerminalScreen *active_screen;
 
       active_screen = terminal_window_get_active (window);
       
       tabs = terminal_window_list_screens (window);
 
-      tmp2 = tabs;
-      while (tmp2 != NULL)
+      for (lt = tabs; lt != NULL; lt = lt->next)
         {
-          TerminalScreen *screen = tmp2->data;
+          TerminalScreen *screen = lt->data;
           const char *profile_id;
           const char **override_command;
           const char *title;
@@ -1222,7 +1218,7 @@
           profile_id = terminal_profile_get_property_string (terminal_screen_get_profile (screen),
                                                              TERMINAL_PROFILE_NAME);
           
-          if (tmp2 == tabs)
+          if (lt == tabs)
             {
                g_ptr_array_add (args, g_strdup_printf ("--window-with-profile-internal-id=%s",
                                                      profile_id));
@@ -1232,7 +1228,7 @@
                  g_ptr_array_add (args, g_strdup ("--hide-menubar"));
 
                g_ptr_array_add (args, g_strdup_printf ("--role=%s",
-                                                     gtk_window_get_role (GTK_WINDOW (window))));
+                                                       gtk_window_get_role (GTK_WINDOW (window))));
             }
           else
             {
@@ -1285,6 +1281,7 @@
           }
 
           zoom = terminal_screen_get_font_scale (screen);
+          /* FIXMEchpe this looks wrong... */
           if (zoom < -1e-6 || zoom > 1e-6) /* if not 1.0 */
             {
               char buf[G_ASCII_DTOSTR_BUF_SIZE];
@@ -1294,13 +1291,9 @@
               g_ptr_array_add (args, g_strdup ("--zoom"));
               g_ptr_array_add (args, g_strdup (buf));
             }
-          
-          tmp2 = tmp2->next;
         }
       
       g_list_free (tabs);
-      
-      tmp = tmp->next;
     }
 
   /* final NULL */