[gitg: 167/167] Merge branch 'vala'
- From: Jesse van den Kieboom <jessevdk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gitg: 167/167] Merge branch 'vala'
- Date: Thu, 19 Jul 2012 10:55:36 +0000 (UTC)
commit 6f7dd13cf7bd6b3a6ebcd0e5b3db11a1f77772b1
Merge: c661801 fb0a809
Author: Jesse van den Kieboom <jesse vandenkieboom epfl ch>
Date: Thu Jul 19 12:55:08 2012 +0200
Merge branch 'vala'
Makefile.am | 8 +-
configure.ac | 212 +-
data/Makefile.am | 8 -
data/gitg-glade.xml | 10 +-
data/gitgdiff.lang | 83 -
data/gitgstyle.xml | 78 -
git.mk | 11 +
gitg/Makefile.am | 126 +-
gitg/gitg-activatable.c | 70 -
gitg/gitg-activatable.h | 55 -
gitg/gitg-application.vala | 428 +
gitg/gitg-autohide-frame.vala | 47 +
gitg/gitg-avatar-cache.c | 416 -
gitg/gitg-avatar-cache.h | 73 -
gitg/gitg-blame-renderer.c | 454 -
gitg/gitg-blame-renderer.h | 61 -
gitg/gitg-branch-actions.c | 2108 --
gitg/gitg-branch-actions.h | 53 -
gitg/gitg-cell-renderer-path.c | 639 -
gitg/gitg-cell-renderer-path.h | 69 -
gitg/gitg-commit-menu.ui | 54 -
gitg/gitg-commit-view.c | 3216 ---
gitg/gitg-commit-view.h | 61 -
gitg/gitg-diff-line-renderer.c | 379 -
gitg/gitg-diff-line-renderer.h | 60 -
gitg/gitg-diff-view.c | 1633 --
gitg/gitg-diff-view.h | 106 -
gitg/gitg-dirs.c | 78 -
gitg/gitg-dirs.h | 32 -
gitg/gitg-dirs.vala | 83 +
gitg/gitg-dnd.c | 1090 -
gitg/gitg-dnd.h | 45 -
gitg/gitg-label-renderer.c | 349 -
gitg/gitg-label-renderer.h | 52 -
gitg/gitg-menus.xml | 168 -
gitg/gitg-new-branch.ui | 106 -
gitg/gitg-plugins-engine.vala | 86 +
gitg/gitg-preferences-dialog.c | 431 -
gitg/gitg-preferences-dialog.h | 57 -
gitg/gitg-preferences-dialog.vala | 69 +
gitg/gitg-preferences.ui | 810 -
gitg/gitg-repository-dialog.c | 906 -
gitg/gitg-repository-dialog.h | 62 -
gitg/gitg-repository.ui | 320 -
gitg/gitg-resource.vala | 81 +
gitg/gitg-revision-changes-panel.c | 1048 -
gitg/gitg-revision-changes-panel.h | 34 -
gitg/gitg-revision-changes-panel.ui | 79 -
gitg/gitg-revision-details-panel.c | 936 -
gitg/gitg-revision-details-panel.h | 58 -
gitg/gitg-revision-details-panel.ui | 270 -
gitg/gitg-revision-files-panel.c | 1524 --
gitg/gitg-revision-files-panel.h | 61 -
gitg/gitg-revision-files-panel.ui | 96 -
gitg/gitg-revision-panel.c | 124 -
gitg/gitg-revision-panel.h | 70 -
gitg/gitg-stat-view.c | 500 -
gitg/gitg-stat-view.h | 37 -
gitg/gitg-tag.ui | 158 -
gitg/gitg-ui-elements.vala | 335 +
gitg/gitg-ui.xml | 136 -
gitg/gitg-uri.c | 103 -
gitg/gitg-uri.h | 17 -
gitg/gitg-utils.c | 466 -
gitg/gitg-utils.h | 61 -
gitg/gitg-window.c | 3584 ---
gitg/gitg-window.h | 87 -
gitg/gitg-window.ui | 576 -
gitg/gitg-window.vala | 298 +
gitg/gitg.c | 207 -
gitg/gitg.vala | 46 +
gitg/resources/gitg-resources.xml | 11 +
gitg/resources/ui/gitg-menus.ui | 46 +
gitg/resources/ui/gitg-preferences.ui | 66 +
gitg/resources/ui/gitg-window.ui | 238 +
gitg/resources/ui/style.css | 105 +
icons.mk | 20 +
libgitg-ext/GitgExt.py | 38 +
libgitg-ext/Makefile.am | 127 +
libgitg-ext/gitg-ext-application.vala | 83 +
libgitg-ext/gitg-ext-assembly-info.vala | 23 +
libgitg-ext/gitg-ext-command-line.vala | 28 +
libgitg-ext/gitg-ext-message-bus.vala | 313 +
libgitg-ext/gitg-ext-message-id.vala | 94 +
libgitg-ext/gitg-ext-message.vala | 59 +
libgitg-ext/gitg-ext-navigation-tree-view.vala | 524 +
libgitg-ext/gitg-ext-navigation.vala | 41 +
libgitg-ext/gitg-ext-object-selection.vala | 31 +
libgitg-ext/gitg-ext-panel.vala | 44 +
libgitg-ext/gitg-ext-preferences.vala | 30 +
libgitg-ext/gitg-ext-ui-element.vala | 117 +
libgitg-ext/gitg-ext-ui.vala | 59 +
libgitg-ext/gitg-ext-view.vala | 92 +
libgitg-ext/libgitg-ext-1.0.pc.in | 11 +
libgitg-ext/resources/resources.xml | 7 +
libgitg-gtk/Makefile.am | 112 +
libgitg-gtk/egg-list-box/.gitignore | 49 +
libgitg-gtk/egg-list-box/AUTHORS | 1 +
libgitg-gtk/egg-list-box/COPYING | 481 +
libgitg-gtk/egg-list-box/INSTALL | 370 +
libgitg-gtk/egg-list-box/Makefile.am | 61 +
libgitg-gtk/egg-list-box/autogen.sh | 18 +
libgitg-gtk/egg-list-box/configure.ac | 25 +
.../egg-list-box/egg-list-box-uninstalled.pc.in | 12 +
libgitg-gtk/egg-list-box/egg-list-box.doap | 18 +
libgitg-gtk/egg-list-box/egg-list-box.vala | 1085 +
libgitg-gtk/egg-list-box/test-list.vala | 203 +
libgitg-gtk/egg-list-box/test-scrolled.vala | 104 +
libgitg-gtk/gitg-gtk-assembly-info.vala | 23 +
libgitg-gtk/gitg-gtk-cell-renderer-lanes.vala | 236 +
libgitg-gtk/gitg-gtk-commit-list-view.vala | 93 +
libgitg-gtk/gitg-gtk-commit-model.vala | 315 +
libgitg-gtk/gitg-gtk-dash-view.vala | 147 +
libgitg-gtk/gitg-gtk-diff-view-request-diff.vala | 297 +
.../gitg-gtk-diff-view-request-resource.vala | 86 +
libgitg-gtk/gitg-gtk-diff-view-request.vala | 213 +
libgitg-gtk/gitg-gtk-diff-view.vala | 248 +
libgitg-gtk/gitg-gtk-label-renderer.vala | 280 +
libgitg-gtk/libgitg-gtk-1.0.pc.in | 11 +
libgitg-gtk/resources/base.css | 127 +
libgitg-gtk/resources/base.html | 42 +
libgitg-gtk/resources/base.js | 294 +
libgitg-gtk/resources/jquery-1.7.2.min.js | 4 +
libgitg-gtk/resources/resources.xml | 11 +
libgitg/Makefile.am | 140 +-
libgitg/gitg-assembly-info.vala | 23 +
libgitg/gitg-changed-file.c | 343 -
libgitg/gitg-changed-file.h | 90 -
libgitg/gitg-color.c | 139 -
libgitg/gitg-color.h | 51 -
libgitg/gitg-color.vala | 119 +
libgitg/gitg-command.c | 513 -
libgitg/gitg-command.h | 98 -
libgitg/gitg-commit-model.vala | 355 +
libgitg/gitg-commit.c | 1484 --
libgitg/gitg-commit.h | 108 -
libgitg/gitg-commit.vala | 120 +
libgitg/gitg-config.c | 529 -
libgitg/gitg-config.h | 75 -
libgitg/gitg-convert.c | 118 -
libgitg/gitg-convert.h | 34 -
libgitg/gitg-debug.c | 74 -
libgitg/gitg-debug.h | 59 -
libgitg/gitg-encodings.c | 570 -
libgitg/gitg-encodings.h | 72 -
libgitg/gitg-enum-types.c.template | 40 -
libgitg/gitg-enum-types.h.template | 28 -
libgitg/gitg-hash.c | 147 -
libgitg/gitg-hash.h | 50 -
libgitg/gitg-i18n.c | 52 -
libgitg/gitg-i18n.h | 71 -
libgitg/gitg-init.vala | 41 +
libgitg/gitg-io.c | 507 -
libgitg/gitg-io.h | 106 -
libgitg/gitg-lane.c | 86 -
libgitg/gitg-lane.h | 69 -
libgitg/gitg-lane.vala | 81 +
libgitg/gitg-lanes.c | 750 -
libgitg/gitg-lanes.h | 64 -
libgitg/gitg-lanes.vala | 483 +
libgitg/gitg-line-parser.c | 479 -
libgitg/gitg-line-parser.h | 67 -
libgitg/gitg-ref.c | 248 -
libgitg/gitg-ref.h | 86 -
libgitg/gitg-ref.vala | 305 +
libgitg/gitg-repository.c | 2081 --
libgitg/gitg-repository.h | 113 -
libgitg/gitg-repository.vala | 144 +
libgitg/gitg-revision.c | 413 -
libgitg/gitg-revision.h | 88 -
libgitg/gitg-runner.c | 646 -
libgitg/gitg-runner.h | 76 -
libgitg/gitg-shell.c | 1045 -
libgitg/gitg-shell.h | 159 -
libgitg/gitg-smart-charset-converter.c | 438 -
libgitg/gitg-smart-charset-converter.h | 76 -
libgitg/libgitg-1.0.pc.in | 11 +
plugins/Makefile.am | 3 +
plugins/dash/Makefile.am | 53 +
plugins/dash/dash.plugin | 11 +
plugins/dash/gitg-dash-navigation.vala | 115 +
plugins/dash/gitg-dash.vala | 288 +
plugins/dash/resources/resources.xml | 10 +
plugins/dash/resources/view-create.ui | 91 +
plugins/dash/resources/view-open.ui | 91 +
plugins/dash/resources/view-recent.ui | 173 +
plugins/diff/Makefile.am | 54 +
plugins/diff/diff.plugin | 11 +
plugins/diff/gitg-diff.vala | 143 +
plugins/diff/icons/Makefile.am | 4 +
plugins/diff/icons/diff-symbolic.svg | 90 +
plugins/diff/resources/resources.xml | 7 +
plugins/files/Makefile.am | 53 +
plugins/files/files.plugin | 11 +
plugins/files/gitg-files-tree-store.vala | 164 +
plugins/files/gitg-files.vala | 297 +
plugins/files/resources/resources.xml | 8 +
plugins/files/resources/view-files.ui | 67 +
plugins/history/Makefile.am | 59 +
plugins/history/gitg-history-command-line.vala | 47 +
plugins/history/gitg-history-navigation.vala | 210 +
plugins/history/gitg-history-preferences.vala | 141 +
plugins/history/gitg-history.vala | 279 +
plugins/history/history.plugin | 12 +
.../org.gnome.gitg.history.gschema.xml.in.in | 52 +
plugins/history/resources/preferences.ui | 252 +
plugins/history/resources/resources.xml | 9 +
plugins/history/resources/view-history.ui | 70 +
po/POTFILES.in | 34 +-
po/POTFILES.skip | 2 -
po/update-potfiles | 32 +
tests/Makefile.am | 21 +-
tests/dash-view.vala | 27 +
tests/diff-view.vala | 148 +
tests/shell.c | 286 -
tools/Makefile.am | 14 -
tools/gitg-config.c | 159 -
tools/gitg-shell.c | 207 -
vapi/WebKit-3.0.gir |27139 ++++++++++++++++++++
vapi/config.vapi | 14 +
vapi/gobject-introspection-1.0.vapi | 31 +
vapi/gtksourceview-3.0.deps | 7 +
vapi/gtksourceview-3.0.vapi | 651 +
vapi/libpeas-1.0.vapi | 119 +
vapi/libsoup-2.4.deps | 1 +
vapi/libsoup-2.4.vapi | 1396 +
vapi/webkitgtk-3.0.deps | 8 +
vapi/webkitgtk-3.0.vapi | 4818 ++++
228 files changed, 47935 insertions(+), 37645 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
