[gitg: 60/60] Merge branch 'wip/commit'

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

commit 39e956e203029e3b7d04c75627423855fc735a8d
Merge: b8fa527 dac6a23
Author: Jesse van den Kieboom <jessevdk gmail com>
Date:   Fri Jul 5 15:59:00 2013 +0200

    Merge branch 'wip/commit'

 configure.ac                                |    1 +
 data/gitg.desktop.in.in                     |    2 +-
 data/org.gnome.gitg.gschema.xml.in.in       |    6 +
 gitg/Makefile.am                            |    6 +-
 gitg/commit/gitg-commit-dialog.vala         |   97 ++++
 gitg/commit/gitg-commit-paned.vala          |   76 ++++
 gitg/commit/gitg-commit.vala                |  592 +++++++++++++++++++++++++
 gitg/gitg-application.vala                  |   46 ++-
 gitg/gitg-ui-elements.vala                  |   15 +
 gitg/gitg-window.vala                       |   49 ++-
 gitg/history/gitg-history.vala              |    4 +-
 gitg/resources/gitg-resources.xml           |    2 +
 gitg/resources/ui/gitg-commit-dialog.ui     |  145 ++++++
 gitg/resources/ui/gitg-commit-paned.ui      |   93 ++++
 gitg/resources/ui/style.css                 |    5 +
 libgitg-ext/gitg-ext-activity.vala          |    9 +-
 libgitg-ext/gitg-ext-application.vala       |    6 +
 libgitg-ext/gitg-ext-ui-element.vala        |   15 +-
 libgitg/Makefile.am                         |   10 +-
 libgitg/gitg-async.vala                     |   50 +++
 libgitg/gitg-commit-model.vala              |    2 +-
 libgitg/gitg-diff-view.vala                 |   72 +++-
 libgitg/gitg-hook.vala                      |  228 ++++++++++
 libgitg/gitg-repository.vala                |   27 +-
 libgitg/gitg-sidebar.vala                   |  452 +++++++++++++++++++
 libgitg/gitg-stage-status-enumerator.vala   |  189 ++++++++
 libgitg/gitg-stage.vala                     |  634 +++++++++++++++++++++++++++
 libgitg/resources/diff-view-html-builder.js |   38 ++-
 libgitg/resources/diff-view.css             |   28 ++
 libgitg/resources/diff-view.html            |    2 +-
 libgitg/resources/diff-view.js              |   28 +-
 libgitg/resources/resources.xml             |    3 +
 libgitg/resources/sidebar-view.ui           |   63 +++
 libgitg/tests/Makefile.am                   |   29 ++
 libgitg/tests/gitg-assert.h                 |   32 ++
 libgitg/tests/gitg-assert.vapi              |    9 +
 libgitg/tests/main.vala                     |  103 +++++
 libgitg/tests/repository.vala               |  343 +++++++++++++++
 libgitg/tests/test-stage.vala               |  226 ++++++++++
 libgitg/tests/test.vala                     |   43 ++
 plugins/diff/gitg-diff.vala                 |    2 +-
 plugins/files/gitg-files.vala               |    2 +-
 po/POTFILES.in                              |    4 +
 tests/diff-view.vala                        |    2 +-
 44 files changed, 3734 insertions(+), 56 deletions(-)
---
diff --cc gitg/gitg-window.vala
index eb18d6a,5393c1c..eb602fa
--- a/gitg/gitg-window.vala
+++ b/gitg/gitg-window.vala
@@@ -670,17 -698,28 +700,28 @@@ public class Window : Gtk.ApplicationWi
                this.repository = repository;
        }
  
-       private void show_infobar(string primary_msg, string secondary_msg, Gtk.MessageType type)
+       public void show_infobar(string          primary_msg,
+                                string          secondary_msg,
+                                Gtk.MessageType type)
        {
 -              infobar.message_type = type;
 +              d_infobar.message_type = type;
-               d_infobar_primary_label.set_label("<b>%s</b>".printf(Markup.escape_text(primary_msg)));
-               
d_infobar_secondary_label.set_label("<small>%s</small>".printf(Markup.escape_text(secondary_msg)));
+ 
+               var primary = "<b>%s</b>".printf(Markup.escape_text(primary_msg));
+               var secondary = "<small>%s</small>".printf(Markup.escape_text(secondary_msg));
+ 
 -              infobar_primary_label.set_label(primary);
 -              infobar_secondary_label.set_label(secondary);
 -              infobar.show();
++              d_infobar_primary_label.set_label(primary);
++              d_infobar_secondary_label.set_label(secondary);
 +              d_infobar_revealer.set_reveal_child(true);
  
 -              infobar_close_button.clicked.connect(() => {
 -                      infobar.hide();
 +              d_infobar_close_button.clicked.connect(() => {
 +                      d_infobar_revealer.set_reveal_child(false);
                });
        }
+ 
+       public Gee.Map<string, string> environment
+       {
+               owned get { return d_environment; }
+       }
  }
  
  }