[gitg/wip/commit: 15/28] Rename view option to activity option

[Jesse van den Kieboom <jessevdk src gnome org>]

commit 85076ee54d25f0819138302c9a90c776bbc900e0
Author: Jesse van den Kieboom <jessevdk gmail com>
Date:   Wed Jul 3 16:36:07 2013 +0200

    Rename view option to activity option

 data/org.gnome.gitg.gschema.xml.in.in |    6 ++++++
 gitg/gitg-application.vala            |   13 +++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/data/org.gnome.gitg.gschema.xml.in.in b/data/org.gnome.gitg.gschema.xml.in.in
index d7327c1..f28fc76 100644
--- a/data/org.gnome.gitg.gschema.xml.in.in
+++ b/data/org.gnome.gitg.gschema.xml.in.in
@@ -113,6 +113,7 @@
   <schema id="org.gnome.gitg.state" path="/org/gnome/gitg/state/">
     <child name="window" schema="org.gnome.gitg.state.window"/>
     <child name="history" schema="org.gnome.gitg.state.history"/>
+    <child name="commit" schema="org.gnome.gitg.state.commit"/>
   </schema>
   <schema id="org.gnome.gitg.state.window" path="/org/gnome/gitg/state/window/">
     <key name="state" type="i">
@@ -142,4 +143,9 @@
       <default>450</default>
     </key>
   </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gitg.state.commit" 
path="/org/gnome/gitg/state/commit/">
+    <key name="paned-sidebar-position" type="i">
+      <default>200</default>
+    </key>
+  </schema>
 </schemalist>
diff --git a/gitg/gitg-application.vala b/gitg/gitg-application.vala
index 92e05d1..5379b5b 100644
--- a/gitg/gitg-application.vala
+++ b/gitg/gitg-application.vala
@@ -40,15 +40,16 @@ public class Application : Gtk.Application
        private struct Options
        {
                public static bool quit = false;
-               public static string view;
+               public static string activity;
                public static bool no_wd = false;
                public static ApplicationCommandLine command_line;
 
                public static const OptionEntry[] entries = {
                        {"version", 'v', OptionFlags.NO_ARG, OptionArg.CALLBACK,
                         (void *)show_version_and_quit, N_("Show the application's version"), null},
-                       {"view", '\0', 0, OptionArg.STRING,
-                        ref view, N_("Start gitg with a particular view"), null},
+
+                       {"activity", '\0', 0, OptionArg.STRING,
+                        ref activity, N_("Start gitg with a particular activity"), null},
                         {"no-wd", 0, 0, OptionArg.NONE,
                         ref no_wd, N_("Do not try to load a repository from the current working directory"), 
null},
                        {null}
@@ -59,7 +60,7 @@ public class Application : Gtk.Application
 
        static construct
        {
-               Options.view = "";
+               Options.activity = "";
        }
 
        private static void show_version_and_quit()
@@ -157,7 +158,7 @@ public class Application : Gtk.Application
                                files += File.new_for_commandline_arg(arg);
                        }
 
-                       open(files, Options.view);
+                       open(files, Options.activity);
                }
                else
                {
@@ -322,7 +323,7 @@ public class Application : Gtk.Application
                        // Otherwise open repository from current dir
                        string? wd = Options.command_line.get_cwd();
 
-                       open(new File[] { File.new_for_path(wd) }, Options.view);
+                       open(new File[] { File.new_for_path(wd) }, Options.activity);
 
                        // Forcing present here covers the case where no window was opened
                        // because wd is not an actual git repository