gnome-terminal r3127 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Tue Oct  7 14:30:30 2008
New Revision: 3127
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=3127&view=rev

Log:
Simplify --tab-*/--window-* option parsing by resuing the same callback.

Modified:
   trunk/src/terminal.c

Modified: trunk/src/terminal.c
==============================================================================
--- trunk/src/terminal.c	(original)
+++ trunk/src/terminal.c	Tue Oct  7 14:30:30 2008
@@ -442,22 +442,11 @@
                         GError     **error)
 {
   OptionParsingResults *results = data;
+  gboolean is_profile_id;
 
-  add_new_window (results, NULL, FALSE);
+  is_profile_id = g_str_has_suffix (option_name, "-with-profile-internal-id");
 
-  return TRUE;
-}
-
-
-static gboolean
-option_window_with_profile_callback (const gchar *option_name,
-                                     const gchar *value,
-                                     gpointer     data,
-                                     GError     **error)
-{
-  OptionParsingResults *results = data;
-
-  add_new_window (results, value, FALSE);
+  add_new_window (results, value, is_profile_id);
 
   return TRUE;
 }
@@ -470,77 +459,19 @@
                      GError     **error)
 {
   OptionParsingResults *results = data;
+  gboolean is_profile_id;
 
-  if (results->initial_windows)
-    {
-      InitialWindow *iw;
-
-      iw = g_list_last (results->initial_windows)->data;
-      iw->tabs = g_list_append (iw->tabs, initial_tab_new (NULL, FALSE));
-    }
-  else
-    {
-      add_new_window (results, NULL, FALSE);
-    }
-
-  return TRUE;
-}
-
-
-static gboolean
-option_tab_with_profile_callback (const gchar *option_name,
-				  const gchar *value,
-				  gpointer     data,
-				  GError     **error)
-{
-  OptionParsingResults *results = data;
+  is_profile_id = g_str_has_suffix (option_name, "-with-profile-internal-id");
 
   if (results->initial_windows)
     {
       InitialWindow *iw;
 
       iw = g_list_last (results->initial_windows)->data;
-      iw->tabs = g_list_append (iw->tabs, initial_tab_new (value, FALSE));
+      iw->tabs = g_list_append (iw->tabs, initial_tab_new (value, is_profile_id));
     }
   else
-    add_new_window (results, value, FALSE);
-
-  return TRUE;
-}
-
-
-static gboolean
-option_window_with_profile_internal_id_callback (const gchar *option_name,
-                                                 const gchar *value,
-                                                 gpointer     data,
-                                                 GError     **error)
-{
-  OptionParsingResults *results = data;
-
-  add_new_window (results, value, TRUE);
-
-  return TRUE;
-}
-
-
-static gboolean
-option_tab_with_profile_internal_id_callback (const gchar *option_name,
-					      const gchar *value,
-					      gpointer     data,
-					      GError     **error)
-{
-  OptionParsingResults *results = data;
-
-  if (results->initial_windows)
-    {
-      InitialWindow *iw;
-
-      iw = g_list_last (results->initial_windows)->data;
-
-      iw->tabs = g_list_append (iw->tabs, initial_tab_new (value, TRUE));
-    }
-  else
-    add_new_window (results, value, TRUE);
+    add_new_window (results, value, is_profile_id);
 
   return TRUE;
 }
@@ -1647,7 +1578,7 @@
       0,
       G_OPTION_FLAG_HIDDEN,
       G_OPTION_ARG_CALLBACK,
-      option_window_with_profile_callback,
+      option_window_callback,
       NULL, NULL
     },
     {
@@ -1655,7 +1586,7 @@
       0,
       G_OPTION_FLAG_HIDDEN,
       G_OPTION_ARG_CALLBACK,
-      option_tab_with_profile_callback,
+      option_tab_callback,
       NULL, NULL
     },
     {
@@ -1663,7 +1594,7 @@
       0,
       G_OPTION_FLAG_HIDDEN,
       G_OPTION_ARG_CALLBACK,
-      option_window_with_profile_internal_id_callback,
+      option_window_callback,
       NULL, NULL
     },
     {
@@ -1671,7 +1602,7 @@
       0,
       G_OPTION_FLAG_HIDDEN,
       G_OPTION_ARG_CALLBACK,
-      option_tab_with_profile_internal_id_callback,
+      option_tab_callback,
       NULL, NULL
     },
     {