[gitg/wip/libmerge] Move files from libgitg-gtk to libgitg
- From: Paolo Borelli <pborelli src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gitg/wip/libmerge] Move files from libgitg-gtk to libgitg
- Date: Sun, 23 Jun 2013 17:28:06 +0000 (UTC)
commit 6151a9395bc97ebf2649ed067452ec10a23bc6cf
Author: Ignacio Casal Quinteiro <icq gnome org>
Date: Sun Jun 23 14:40:04 2013 +0200
Move files from libgitg-gtk to libgitg
Makefile.am | 2 +-
configure.ac | 37 ++-----
gitg/Makefile.am | 6 +-
gitg/gitg-window.vala | 2 +-
gitg/resources/ui/gitg-window.ui | 2 +-
libgitg-ext/Makefile.am | 3 +
libgitg-gtk/Makefile.am | 114 --------------------
libgitg-gtk/libgitg-gtk-1.0.pc.in | 11 --
libgitg/Makefile.am | 61 ++++++++---
.../gitg-gtk-assembly-info.vala | 4 +-
.../gitg-gtk-cell-renderer-lanes.vala | 2 +-
.../gitg-gtk-commit-list-view.vala | 6 +-
.../gitg-gtk-commit-model.vala | 2 +-
{libgitg-gtk => libgitg}/gitg-gtk-dash-view.vala | 2 +-
.../gitg-gtk-diff-view-request-diff.vala | 2 +-
.../gitg-gtk-diff-view-request-resource.vala | 4 +-
.../gitg-gtk-diff-view-request.vala | 2 +-
{libgitg-gtk => libgitg}/gitg-gtk-diff-view.vala | 6 +-
.../gitg-gtk-label-renderer.vala | 2 +-
.../gitg-gtk-progress-bin.vala | 2 +-
{libgitg-gtk => libgitg}/gitg-gtk-when-mapped.vala | 2 +-
libgitg/libgitg-1.0.pc.in | 2 +-
.../resources/diff-view-html-builder.js | 0
{libgitg-gtk => libgitg}/resources/diff-view.css | 0
{libgitg-gtk => libgitg}/resources/diff-view.html | 0
{libgitg-gtk => libgitg}/resources/diff-view.js | 0
.../resources/jquery-1.10.1.min.js | 0
{libgitg-gtk => libgitg}/resources/resources.xml | 0
plugins/diff/gitg-diff.vala | 8 +-
plugins/files/gitg-files.vala | 4 +-
plugins/history/gitg-history.vala | 8 +-
plugins/history/resources/view-history.ui | 4 +-
tests/dash-view.vala | 2 +-
tests/diff-view.vala | 4 +-
tests/progress-bin.vala | 2 +-
35 files changed, 102 insertions(+), 206 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 56974df..70d3bc2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
-SUBDIRS = libgd libgitg libgitg-gtk libgitg-ext plugins gitg data po tests
+SUBDIRS = libgd libgitg libgitg-ext plugins gitg data po tests
DISTCLEANFILES = \
intltool-extract \
diff --git a/configure.ac b/configure.ac
index eb4426d..1a3fa4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,6 +90,7 @@ GLIB_REQUIRED_VERSION=2.32
GTK_REQUIRED_VERSION=3.9.0
GTKSOURCEVIEW_REQUIRED_VERSION=3.1.3
INTROSPECTION_REQUIRED=0.10.1
+WEBKITGTK_REQUIRED_VERSION=1.9.92
PKG_CHECK_MODULES(LIBGITG, [
gthread-2.0 >= $GLIB_REQUIRED_VERSION
@@ -100,6 +101,10 @@ PKG_CHECK_MODULES(LIBGITG, [
gio-unix-2.0 >= $GLIB_REQUIRED_VERSION
gobject-introspection-1.0 >= $INTROSPECTION_REQUIRED
libgit2-glib-1.0
+ gtk+-3.0 >= $GTK_REQUIRED_VERSION
+ webkit2gtk-3.0 >= $WEBKITGTK_REQUIRED_VERSION
+ gee-0.8
+ json-glib-1.0
])
AC_ARG_ENABLE(docs,
@@ -149,28 +154,15 @@ if test "x$enable_debug" = "xyes"; then
AC_DEFINE([ENABLE_DEBUG],[1],[Whether debugging support is enabled])
fi
+LIBGITG_CFLAGS="$LIBGITG_CFLAGS -DLIBSOUP_USE_UNSTABLE_REQUEST_API"
+
AC_SUBST(LIBGITG_CFLAGS)
AC_SUBST(LIBGITG_LIBS)
AC_SUBST(GITG_VALAFLAGS)
-WEBKITGTK_REQUIRED_VERSION=1.9.92
-
-PKG_CHECK_MODULES(LIBGITG_GTK, [
- gtk+-3.0 >= $GTK_REQUIRED_VERSION
- webkit2gtk-3.0 >= $WEBKITGTK_REQUIRED_VERSION
- gee-0.8
- json-glib-1.0
-])
-
-LIBGITG_GTK_CFLAGS="$LIBGITG_CFLAGS $LIBGITG_GTK_CFLAGS -DLIBSOUP_USE_UNSTABLE_REQUEST_API"
-LIBGITG_GTK_LIBS="$LIBGITG_LIBS $LIBGITG_GTK_LIBS"
-
-AC_SUBST(LIBGITG_GTK_CFLAGS)
-AC_SUBST(LIBGITG_GTK_LIBS)
-
-LIBGITG_EXT_CFLAGS="$LIBGITG_GTK_CFLAGS"
-LIBGITG_EXT_LIBS="$LIBGITG_GTK_LIBS"
+LIBGITG_EXT_CFLAGS="$LIBGITG_CFLAGS"
+LIBGITG_EXT_LIBS="$LIBGITG_LIBS"
AC_SUBST(LIBGITG_EXT_CFLAGS)
AC_SUBST(LIBGITG_EXT_LIBS)
@@ -185,8 +177,8 @@ PKG_CHECK_MODULES(GITG, [
libpeas-gtk-1.0 >= $LIBPEAS_GTK_REQUIRED_VERSION
])
-GITG_CFLAGS="$LIBGITG_GTK_CFLAGS $GITG_CFLAGS"
-GITG_LIBS="$LIBGITG_GTK_LIBS $GITG_LIBS -lm"
+GITG_CFLAGS="$LIBGITG_CFLAGS $GITG_CFLAGS"
+GITG_LIBS="$LIBGITG_LIBS $GITG_LIBS -lm"
AC_SUBST(GITG_CFLAGS)
AC_SUBST(GITG_LIBS)
@@ -225,8 +217,7 @@ GITG_PLUGIN_CFLAGS="$GITG_CFLAGS"
GITG_PLUGIN_LIBS="$GITG_LIBS \
\$(top_builddir)/libgd/libgd.la \
\$(top_builddir)/libgitg/libgitg-1.0.la \
- \$(top_builddir)/libgitg-ext/libgitg-ext-1.0.la \
- \$(top_builddir)/libgitg-gtk/libgitg-gtk-1.0.la"
+ \$(top_builddir)/libgitg-ext/libgitg-ext-1.0.la"
AC_SUBST(GITG_PLUGIN_CFLAGS)
AC_SUBST(GITG_PLUGIN_LIBS)
@@ -238,7 +229,6 @@ GITG_PLUGIN_VALAFLAGS=" \
--pkg Ggit-1.0 \
--pkg libgitg-ext-1.0 \
--pkg libgitg-1.0 \
- --pkg libgitg-gtk-1.0 \
--pkg gio-2.0 \
--pkg gtk+-3.0 \
--pkg gtksourceview-3.0 \
@@ -252,7 +242,6 @@ GITG_PLUGIN_VALAFLAGS=" \
\$(GITG_VALAFLAGS) \
--vapidir \$(top_srcdir)/vapi \
--vapidir \$(top_builddir)/libgitg \
- --vapidir \$(top_builddir)/libgitg-gtk \
--vapidir \$(top_builddir)/libgitg-ext \
--vapidir \$(top_builddir)/libgd"
@@ -295,8 +284,6 @@ Makefile
libgd/Makefile
libgitg/Makefile
libgitg/libgitg-1.0.pc
-libgitg-gtk/Makefile
-libgitg-gtk/libgitg-gtk-1.0.pc
libgitg-ext/Makefile
libgitg-ext/libgitg-ext-1.0.pc
gitg/Makefile
diff --git a/gitg/Makefile.am b/gitg/Makefile.am
index 9be0390..1c499ba 100644
--- a/gitg/Makefile.am
+++ b/gitg/Makefile.am
@@ -17,7 +17,6 @@ AM_VALAFLAGS = \
--pkg Ggit-1.0 \
--pkg libgitg-1.0 \
--pkg libgitg-ext-1.0 \
- --pkg libgitg-gtk-1.0 \
--pkg gtk+-3.0 \
--pkg gio-2.0 \
--pkg libpeas-1.0 \
@@ -28,12 +27,10 @@ AM_VALAFLAGS = \
--girdir "$(top_builddir)/libgd" \
--girdir "$(top_builddir)/libgitg" \
--girdir "$(top_builddir)/libgitg-ext" \
- --girdir "$(top_builddir)/libgitg-gtk" \
--vapidir "$(top_srcdir)/vapi" \
--vapidir "$(top_builddir)/libgd" \
--vapidir "$(top_builddir)/libgitg" \
--vapidir "$(top_builddir)/libgitg-ext" \
- --vapidir "$(top_builddir)/libgitg-gtk" \
--gresources "$(top_srcdir)/gitg/resources/gitg-resources.xml"
VALASOURCES = \
@@ -61,8 +58,7 @@ gitg_LDADD = \
$(PACKAGE_LIBS) \
$(top_builddir)/libgd/libgd.la \
$(top_builddir)/libgitg/libgitg-1.0.la \
- $(top_builddir)/libgitg-ext/libgitg-ext-1.0.la \
- $(top_builddir)/libgitg-gtk/libgitg-gtk-1.0.la
+ $(top_builddir)/libgitg-ext/libgitg-ext-1.0.la
gitg_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
diff --git a/gitg/gitg-window.vala b/gitg/gitg-window.vala
index 1191805..7b7c51e 100644
--- a/gitg/gitg-window.vala
+++ b/gitg/gitg-window.vala
@@ -59,7 +59,7 @@ public class Window : Gtk.ApplicationWindow, GitgExt.Application, Initable
[GtkChild]
private Gtk.ScrolledWindow d_dash_scrolled_window;
[GtkChild]
- private GitgGtk.DashView d_dash_view;
+ private Gitg.DashView d_dash_view;
[GtkChild]
private Gtk.Stack d_stack_view;
diff --git a/gitg/resources/ui/gitg-window.ui b/gitg/resources/ui/gitg-window.ui
index a0240b7..823113b 100644
--- a/gitg/resources/ui/gitg-window.ui
+++ b/gitg/resources/ui/gitg-window.ui
@@ -219,7 +219,7 @@
<class name="content-view"/>
</style>
<child>
- <object class="GitgGtkDashView" id="d_dash_view">
+ <object class="GitgDashView" id="d_dash_view">
<property name="visible">True</property>
<property name="can_focus">True</property>
<signal name="repository_activated" handler="dash_view_repository_activated"
swapped="no"/>
diff --git a/libgitg-ext/Makefile.am b/libgitg-ext/Makefile.am
index e401912..3bde50d 100644
--- a/libgitg-ext/Makefile.am
+++ b/libgitg-ext/Makefile.am
@@ -13,8 +13,11 @@ COMMON_VALA_FLAGS = \
--pkg libgitg-1.0 \
--pkg gio-2.0 \
--pkg gtk+-3.0 \
+ --pkg libsoup-2.4 \
+ --pkg webkit2gtk-3.0 \
--pkg gee-0.8 \
--basedir $(top_srcdir) \
+ --vapidir $(top_srcdir)/vapi \
--vapidir $(top_builddir)/libgitg
AM_VALAFLAGS = \
diff --git a/libgitg/Makefile.am b/libgitg/Makefile.am
index b7e337d..54b2151 100644
--- a/libgitg/Makefile.am
+++ b/libgitg/Makefile.am
@@ -18,8 +18,14 @@ INST_H_FILES = \
AM_VALAFLAGS = \
--pkg Ggit-1.0 \
+ --pkg gtk+-3.0 \
--pkg gio-2.0 \
+ --pkg libsoup-2.4 \
+ --pkg webkit2gtk-3.0 \
+ --pkg gee-0.8 \
+ --pkg json-glib-1.0 \
$(GITG_VALAFLAGS) \
+ --vapidir $(top_srcdir)/vapi \
--header libgitg.h \
--includedir libgitg \
--basedir $(top_srcdir) \
@@ -29,24 +35,37 @@ AM_VALAFLAGS = \
Gitg-1.0.gir: libgitg-1.0.la
libgitg.h: libgitg-1.0.la
-VALA_FILES = \
- gitg-assembly-info.vala \
- gitg-branch.vala \
- gitg-branch-base.vala \
- gitg-repository.vala \
- gitg-ref.vala \
- gitg-ref-base.vala \
- gitg-lane.vala \
- gitg-lanes.vala \
- gitg-color.vala \
- gitg-init.vala \
- gitg-commit.vala
+VALA_FILES = \
+ gitg-assembly-info.vala \
+ gitg-branch.vala \
+ gitg-branch-base.vala \
+ gitg-repository.vala \
+ gitg-ref.vala \
+ gitg-ref-base.vala \
+ gitg-lane.vala \
+ gitg-lanes.vala \
+ gitg-color.vala \
+ gitg-init.vala \
+ gitg-commit.vala \
+ gitg-gtk-assembly-info.vala \
+ gitg-gtk-commit-model.vala \
+ gitg-gtk-label-renderer.vala \
+ gitg-gtk-cell-renderer-lanes.vala \
+ gitg-gtk-commit-list-view.vala \
+ gitg-gtk-diff-view.vala \
+ gitg-gtk-diff-view-request.vala \
+ gitg-gtk-diff-view-request-resource.vala \
+ gitg-gtk-diff-view-request-diff.vala \
+ gitg-gtk-dash-view.vala \
+ gitg-gtk-when-mapped.vala \
+ gitg-gtk-progress-bin.vala
# Ignore all warnings for vala code...
libgitg_1_0_la_CFLAGS = \
-w
libgitg_1_0_la_SOURCES = \
+ gitg-resources.c \
$(VALA_FILES)
headerdir = $(prefix)/include/libgitg-1.0/libgitg
@@ -67,14 +86,30 @@ typelib_DATA = Gitg-1.0.typelib
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libgitg-1.0.pc
+gitg-resources.c: resources/resources.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies
--sourcedir $(srcdir)/resources resources/resources.xml)
+ $(GLIB_COMPILE_RESOURCES) --generate-source \
+ --sourcedir $(srcdir)/resources \
+ --target "$@" "$<"
+
+gitg-resources.h: resources/resources.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies
--sourcedir $(srcdir)/resources resources/resources.xml)
+ $(GLIB_COMPILE_RESOURCES) --generate-header \
+ --sourcedir $(srcdir)/resources \
+ --target "$@" "$<"
+
BUILT_SOURCES = \
$(gir_DATA) \
$(vapi_DATA) \
$(typelib_DATA) \
libgitg_1_0_la_vala.stamp \
+ gitg-resources.c \
+ gitg-resources.h \
libgitg.h
-EXTRA_DIST = $(pkgconfig_DATA)
+EXTRA_DIST = \
+ $(pkgconfig_DATA) \
+ resources/resources.xml \
+ $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir)/resources
resources/resources.xml)
+
CLEANFILES = $(VALA_FILES:.vala=.c)
dist-hook:
diff --git a/libgitg-gtk/gitg-gtk-assembly-info.vala b/libgitg/gitg-gtk-assembly-info.vala
similarity index 90%
rename from libgitg-gtk/gitg-gtk-assembly-info.vala
rename to libgitg/gitg-gtk-assembly-info.vala
index 1d1d49b..883ab2a 100644
--- a/libgitg-gtk/gitg-gtk-assembly-info.vala
+++ b/libgitg/gitg-gtk-assembly-info.vala
@@ -17,7 +17,7 @@
* along with gitg. If not, see <http://www.gnu.org/licenses/>.
*/
-[CCode (gir_namespace = "GitgGtk", gir_version = "1.0")]
-namespace GitgGtk {}
+[CCode (gir_namespace = "Gitg", gir_version = "1.0")]
+namespace Gitg {}
// ex:set ts=4 noet
diff --git a/libgitg-gtk/gitg-gtk-cell-renderer-lanes.vala b/libgitg/gitg-gtk-cell-renderer-lanes.vala
similarity index 99%
rename from libgitg-gtk/gitg-gtk-cell-renderer-lanes.vala
rename to libgitg/gitg-gtk-cell-renderer-lanes.vala
index f2d50f4..f35a426 100644
--- a/libgitg-gtk/gitg-gtk-cell-renderer-lanes.vala
+++ b/libgitg/gitg-gtk-cell-renderer-lanes.vala
@@ -17,7 +17,7 @@
* along with gitg. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace GitgGtk
+namespace Gitg
{
class CellRendererLanes : Gtk.CellRendererText
{
diff --git a/libgitg-gtk/gitg-gtk-commit-list-view.vala b/libgitg/gitg-gtk-commit-list-view.vala
similarity index 94%
rename from libgitg-gtk/gitg-gtk-commit-list-view.vala
rename to libgitg/gitg-gtk-commit-list-view.vala
index b4f3e8c..47b6c2e 100644
--- a/libgitg-gtk/gitg-gtk-commit-list-view.vala
+++ b/libgitg/gitg-gtk-commit-list-view.vala
@@ -17,18 +17,18 @@
* along with gitg. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace GitgGtk
+namespace Gitg
{
public class CommitListView : Gtk.TreeView, Gtk.Buildable
{
- public CommitListView(GitgGtk.CommitModel model)
+ public CommitListView(Gitg.CommitModel model)
{
Object(model: model);
}
public CommitListView.for_repository(Gitg.Repository repository)
{
- this(new GitgGtk.CommitModel(repository));
+ this(new Gitg.CommitModel(repository));
}
private void lanes_data_func(Gtk.CellLayout layout,
diff --git a/libgitg-gtk/gitg-gtk-commit-model.vala b/libgitg/gitg-gtk-commit-model.vala
similarity index 99%
rename from libgitg-gtk/gitg-gtk-commit-model.vala
rename to libgitg/gitg-gtk-commit-model.vala
index acb0c97..16129f0 100644
--- a/libgitg-gtk/gitg-gtk-commit-model.vala
+++ b/libgitg/gitg-gtk-commit-model.vala
@@ -17,7 +17,7 @@
* along with gitg. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace GitgGtk
+namespace Gitg
{
public enum CommitModelColumns
{
diff --git a/libgitg-gtk/gitg-gtk-dash-view.vala b/libgitg/gitg-gtk-dash-view.vala
similarity index 99%
rename from libgitg-gtk/gitg-gtk-dash-view.vala
rename to libgitg/gitg-gtk-dash-view.vala
index 7d416dd..b39615c 100644
--- a/libgitg-gtk/gitg-gtk-dash-view.vala
+++ b/libgitg/gitg-gtk-dash-view.vala
@@ -20,7 +20,7 @@
using Gitg;
using Gtk;
-namespace GitgGtk
+namespace Gitg
{
public class DashView : ListBox
{
diff --git a/libgitg-gtk/gitg-gtk-diff-view-request-diff.vala b/libgitg/gitg-gtk-diff-view-request-diff.vala
similarity index 99%
rename from libgitg-gtk/gitg-gtk-diff-view-request-diff.vala
rename to libgitg/gitg-gtk-diff-view-request-diff.vala
index 238ddfc..88eee30 100644
--- a/libgitg-gtk/gitg-gtk-diff-view-request-diff.vala
+++ b/libgitg/gitg-gtk-diff-view-request-diff.vala
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with gitg. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace GitgGtk
+namespace Gitg
{
class DiffViewRequestDiff : DiffViewRequest
{
diff --git a/libgitg-gtk/gitg-gtk-diff-view-request-resource.vala
b/libgitg/gitg-gtk-diff-view-request-resource.vala
similarity index 97%
rename from libgitg-gtk/gitg-gtk-diff-view-request-resource.vala
rename to libgitg/gitg-gtk-diff-view-request-resource.vala
index f31c37e..d2e7eb1 100644
--- a/libgitg-gtk/gitg-gtk-diff-view-request-resource.vala
+++ b/libgitg/gitg-gtk-diff-view-request-resource.vala
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with gitg. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace GitgGtk
+namespace Gitg
{
class DiffViewRequestResource : DiffViewRequest
{
@@ -63,7 +63,7 @@ namespace GitgGtk
if (repopath != null)
{
- d_resource =
File.new_for_path(Path.build_filename(repopath.get_path(), "..", "libgitg-gtk", "resources", path));
+ d_resource =
File.new_for_path(Path.build_filename(repopath.get_path(), "..", "libgitg", "resources", path));
}
else
{
diff --git a/libgitg-gtk/gitg-gtk-diff-view-request.vala b/libgitg/gitg-gtk-diff-view-request.vala
similarity index 99%
rename from libgitg-gtk/gitg-gtk-diff-view-request.vala
rename to libgitg/gitg-gtk-diff-view-request.vala
index acc11c7..bac8a7d 100644
--- a/libgitg-gtk/gitg-gtk-diff-view-request.vala
+++ b/libgitg/gitg-gtk-diff-view-request.vala
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with gitg. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace GitgGtk
+namespace Gitg
{
public class DiffViewRequest
{
diff --git a/libgitg-gtk/gitg-gtk-diff-view.vala b/libgitg/gitg-gtk-diff-view.vala
similarity index 97%
rename from libgitg-gtk/gitg-gtk-diff-view.vala
rename to libgitg/gitg-gtk-diff-view.vala
index 58e56f8..c10c665 100644
--- a/libgitg-gtk/gitg-gtk-diff-view.vala
+++ b/libgitg/gitg-gtk-diff-view.vala
@@ -17,7 +17,7 @@
* along with gitg. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace GitgGtk
+namespace Gitg
{
public class DiffView : WebKit.WebView
{
@@ -25,7 +25,7 @@ namespace GitgGtk
private Gitg.Commit? d_commit;
private Settings d_fontsettings;
- private static Gee.HashMap<string, GitgGtk.DiffView> s_diffmap;
+ private static Gee.HashMap<string, Gitg.DiffView> s_diffmap;
private static uint64 s_diff_id;
public File? custom_css { get; construct; }
@@ -62,7 +62,7 @@ namespace GitgGtk
static construct
{
- s_diffmap = new Gee.HashMap<string, GitgGtk.DiffView>();
+ s_diffmap = new Gee.HashMap<string, Gitg.DiffView>();
var context = WebKit.WebContext.get_default();
context.register_uri_scheme("gitg-diff", gitg_diff_request);
diff --git a/libgitg-gtk/gitg-gtk-label-renderer.vala b/libgitg/gitg-gtk-label-renderer.vala
similarity index 99%
rename from libgitg-gtk/gitg-gtk-label-renderer.vala
rename to libgitg/gitg-gtk-label-renderer.vala
index 9e15f95..e63a2e2 100644
--- a/libgitg-gtk/gitg-gtk-label-renderer.vala
+++ b/libgitg/gitg-gtk-label-renderer.vala
@@ -17,7 +17,7 @@
* along with gitg. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace GitgGtk
+namespace Gitg
{
public class LabelRenderer
{
diff --git a/libgitg-gtk/gitg-gtk-progress-bin.vala b/libgitg/gitg-gtk-progress-bin.vala
similarity index 99%
rename from libgitg-gtk/gitg-gtk-progress-bin.vala
rename to libgitg/gitg-gtk-progress-bin.vala
index 6f853f1..6dcfaa3 100644
--- a/libgitg-gtk/gitg-gtk-progress-bin.vala
+++ b/libgitg/gitg-gtk-progress-bin.vala
@@ -17,7 +17,7 @@
* along with gitg. If not, see <http://www.gnu.org/licenses/>.
*/
-namespace GitgGtk
+namespace Gitg
{
public class ProgressBin : Gtk.Bin
{
diff --git a/libgitg-gtk/gitg-gtk-when-mapped.vala b/libgitg/gitg-gtk-when-mapped.vala
similarity index 98%
rename from libgitg-gtk/gitg-gtk-when-mapped.vala
rename to libgitg/gitg-gtk-when-mapped.vala
index 40a1397..5f66206 100644
--- a/libgitg-gtk/gitg-gtk-when-mapped.vala
+++ b/libgitg/gitg-gtk-when-mapped.vala
@@ -1,4 +1,4 @@
-namespace GitgGtk
+namespace Gitg
{
public class WhenMapped
{
diff --git a/libgitg/libgitg-1.0.pc.in b/libgitg/libgitg-1.0.pc.in
index 59ff1fe..2f1c599 100644
--- a/libgitg/libgitg-1.0.pc.in
+++ b/libgitg/libgitg-1.0.pc.in
@@ -6,6 +6,6 @@ includedir= includedir@
Name: @PACKAGE_NAME@
Description: gitg library
Version: @PACKAGE_VERSION@
-Requires: libgit2-glib-1.0 glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 gio-unix-2.0 gthread-2.0
+Requires: libgit2-glib-1.0 glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 gio-unix-2.0 gthread-2.0 gtk+-3.0
Libs: -L${libdir} -lgitg-1.0
Cflags: -I${includedir}/libgitg-1.0
diff --git a/libgitg-gtk/resources/diff-view-html-builder.js b/libgitg/resources/diff-view-html-builder.js
similarity index 100%
rename from libgitg-gtk/resources/diff-view-html-builder.js
rename to libgitg/resources/diff-view-html-builder.js
diff --git a/libgitg-gtk/resources/diff-view.css b/libgitg/resources/diff-view.css
similarity index 100%
rename from libgitg-gtk/resources/diff-view.css
rename to libgitg/resources/diff-view.css
diff --git a/libgitg-gtk/resources/diff-view.html b/libgitg/resources/diff-view.html
similarity index 100%
rename from libgitg-gtk/resources/diff-view.html
rename to libgitg/resources/diff-view.html
diff --git a/libgitg-gtk/resources/diff-view.js b/libgitg/resources/diff-view.js
similarity index 100%
rename from libgitg-gtk/resources/diff-view.js
rename to libgitg/resources/diff-view.js
diff --git a/libgitg-gtk/resources/jquery-1.10.1.min.js b/libgitg/resources/jquery-1.10.1.min.js
similarity index 100%
rename from libgitg-gtk/resources/jquery-1.10.1.min.js
rename to libgitg/resources/jquery-1.10.1.min.js
diff --git a/libgitg-gtk/resources/resources.xml b/libgitg/resources/resources.xml
similarity index 100%
rename from libgitg-gtk/resources/resources.xml
rename to libgitg/resources/resources.xml
diff --git a/plugins/diff/gitg-diff.vala b/plugins/diff/gitg-diff.vala
index 4ff19ed..81740ec 100644
--- a/plugins/diff/gitg-diff.vala
+++ b/plugins/diff/gitg-diff.vala
@@ -26,19 +26,19 @@ namespace GitgDiff
public GitgExt.Application? application { owned get; construct set; }
private Gtk.ScrolledWindow d_sw;
- private GitgGtk.DiffView d_diff;
+ private Gitg.DiffView d_diff;
private GitgExt.ObjectSelection? d_view;
- private GitgGtk.WhenMapped d_whenMapped;
+ private Gitg.WhenMapped d_whenMapped;
construct
{
d_sw = new Gtk.ScrolledWindow(null, null);
d_sw.show();
- d_diff = new GitgGtk.DiffView(null);
+ d_diff = new Gitg.DiffView(null);
d_diff.show();
d_sw.add(d_diff);
- d_whenMapped = new GitgGtk.WhenMapped(d_sw);
+ d_whenMapped = new Gitg.WhenMapped(d_sw);
application.notify["current_view"].connect((a, v) => {
notify_property("available");
diff --git a/plugins/files/gitg-files.vala b/plugins/files/gitg-files.vala
index b787022..b31b470 100644
--- a/plugins/files/gitg-files.vala
+++ b/plugins/files/gitg-files.vala
@@ -40,7 +40,7 @@ namespace GitgFiles
private Gtk.Viewport d_imagevp;
private Gtk.Image d_image;
- private GitgGtk.WhenMapped d_whenMapped;
+ private Gitg.WhenMapped d_whenMapped;
construct
{
@@ -196,7 +196,7 @@ namespace GitgFiles
update_packing();
}
- d_whenMapped = new GitgGtk.WhenMapped(d_paned);
+ d_whenMapped = new Gitg.WhenMapped(d_paned);
}
public Gtk.Widget? widget
diff --git a/plugins/history/gitg-history.vala b/plugins/history/gitg-history.vala
index a45256b..9665a2a 100644
--- a/plugins/history/gitg-history.vala
+++ b/plugins/history/gitg-history.vala
@@ -30,7 +30,7 @@ namespace GitgHistory
public GitgExt.Application? application { owned get; construct set; }
private Navigation? d_navigation_model;
- private GitgGtk.CommitModel? d_commit_list_model;
+ private Gitg.CommitModel? d_commit_list_model;
private Gee.HashSet<Ggit.OId> d_selected;
private ulong d_insertsig;
private Settings d_settings;
@@ -89,7 +89,7 @@ namespace GitgHistory
on_ref_activated(d_navigation_model, r);
});
- d_commit_list_model = new GitgGtk.CommitModel(application.repository);
+ d_commit_list_model = new Gitg.CommitModel(application.repository);
d_commit_list_model.started.connect(on_commit_model_started);
d_commit_list_model.finished.connect(on_commit_model_finished);
@@ -116,7 +116,7 @@ namespace GitgHistory
}
}
- private void on_commit_model_started(GitgGtk.CommitModel model)
+ private void on_commit_model_started(Gitg.CommitModel model)
{
if (d_insertsig == 0)
{
@@ -140,7 +140,7 @@ namespace GitgHistory
}
}
- private void on_commit_model_finished(GitgGtk.CommitModel model)
+ private void on_commit_model_finished(Gitg.CommitModel model)
{
if (d_insertsig != 0)
{
diff --git a/plugins/history/resources/view-history.ui b/plugins/history/resources/view-history.ui
index 8a0ba1f..ccf6a26 100644
--- a/plugins/history/resources/view-history.ui
+++ b/plugins/history/resources/view-history.ui
@@ -55,7 +55,7 @@
<property name="can_focus">True</property>
<property name="shadow-type">none</property>
<child>
- <object class="GitgGtkCommitListView" id="commit_list_view">
+ <object class="GitgCommitListView" id="commit_list_view">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="rules_hint">True</property>
@@ -69,7 +69,7 @@
<property name="expand">True</property>
<property name="fixed-width">600</property>
<child>
- <object class="GitgGtkCellRendererLanes" id="renderer_commit_list_subject">
+ <object class="GitgCellRendererLanes" id="renderer_commit_list_subject">
<property name="ellipsize">end</property>
</object>
<attributes>
diff --git a/tests/dash-view.vala b/tests/dash-view.vala
index a7e9fb9..e549c8b 100644
--- a/tests/dash-view.vala
+++ b/tests/dash-view.vala
@@ -1,5 +1,5 @@
using Gtk;
-using GitgGtk;
+using Gitg;
class TestDashView
{
diff --git a/tests/diff-view.vala b/tests/diff-view.vala
index a32742c..7bff085 100644
--- a/tests/diff-view.vala
+++ b/tests/diff-view.vala
@@ -9,7 +9,7 @@ class TestDiffView
{
// Launch in local mode
var path = File.new_for_path(args[0]);
- var gtk = path.get_parent().get_parent().get_parent().get_child("libgitg-gtk");
+ var gtk = path.get_parent().get_parent().get_parent().get_child("libgitg");
var rargs = args;
@@ -100,7 +100,7 @@ class TestDiffView
wnd.set_default_size(800, 600);
var sw = new Gtk.ScrolledWindow(null, null);
- var v = new GitgGtk.DiffView(null);
+ var v = new Gitg.DiffView(null);
sw.add(v);
v.commit = commit;
diff --git a/tests/progress-bin.vala b/tests/progress-bin.vala
index 1f82130..6afa5b9 100644
--- a/tests/progress-bin.vala
+++ b/tests/progress-bin.vala
@@ -1,5 +1,5 @@
using Gtk;
-using GitgGtk;
+using Gitg;
class TestProgressGrid
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
