GNOME.org
 

[gitg] Remove libgd

commit e7c04a1b944d33a89321c607a65926287f182263
Author: Jesse van den Kieboom <jessevdk gnome org>
Date:   Wed Dec 23 13:36:51 2015 +0100

    Remove libgd

 .gitmodules                                        |    3 ---
 Makefile.am                                        |    4 ++--
 configure.ac                                       |   13 +------------
 gitg/Makefile.am                                   |    5 -----
 gitg/gitg-window.vala                              |    5 ++++-
 gitg/gitg.vala                                     |    3 ---
 gitg/history/gitg-history-paned.vala               |    9 ---------
 .../ui/gitg-commit-submodule-history-view.ui       |    6 +++---
 gitg/resources/ui/gitg-history-paned.ui            |    4 ++--
 gitg/resources/ui/gitg-window.ui                   |    4 +---
 libgd                                              |    1 -
 po/POTFILES.skip                                   |    2 --
 12 files changed, 13 insertions(+), 46 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index 303eb9b..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "libgd"]
-       path = libgd
-       url = ../libgd
diff --git a/Makefile.am b/Makefile.am
index 5a155c3..b5abc90 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
-ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS = libgd po
+SUBDIRS = po
 
 DISTCLEANFILES = \
        intltool-extract \
diff --git a/configure.ac b/configure.ac
index 06902fc..dc8c29c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -317,12 +317,10 @@ GITG_PLUGIN_VALAFLAGS="                           \
        --pkg json-glib-1.0                     \
        --pkg libsecret-1                       \
        --pkg config                            \
-       --pkg gd-1.0                            \
        \$(GITG_VALAFLAGS)                      \
        --vapidir \$(top_srcdir)/vapi           \
        --vapidir \$(top_builddir)/libgitg      \
-       --vapidir \$(top_builddir)/libgitg-ext  \
-       --vapidir \$(top_builddir)/libgd"
+       --vapidir \$(top_builddir)/libgitg-ext"
 
 AC_SUBST(GITG_PLUGIN_VALAFLAGS)
 
@@ -352,18 +350,9 @@ fi
 
 AM_CONDITIONAL(ENABLE_PYTHON, test x"$enable_python" = "xyes")
 
-dnl libgd
-LIBGD_INIT([
-       tagged-entry
-       _view-common
-       static
-       vapi
-])
-
 AC_CONFIG_FILES([
 Makefile
 gitg/resources/gitg-resources.xml
-libgd/Makefile
 libgitg/libgitg-1.0.pc
 libgitg-ext/libgitg-ext-1.0.pc
 data/gitg.desktop.in
diff --git a/gitg/Makefile.am b/gitg/Makefile.am
index a3720ed..cba3577 100644
--- a/gitg/Makefile.am
+++ b/gitg/Makefile.am
@@ -3,7 +3,6 @@ bin_PROGRAMS += gitg/gitg
 gitg_gitg_CPPFLAGS =                                           \
        -I$(top_srcdir)                                         \
        -I$(srcdir)                                             \
-       -I$(top_srcdir)/libgd                                   \
        -DDATADIR=\""$(datadir)"\"                              \
        -DGITG_DATADIR=\""$(datadir)/gitg"\"                    \
        -DGITG_LOCALEDIR=\""$(datadir)/locale"\"
@@ -23,20 +22,16 @@ gitg_gitg_VALAFLAGS =                                               \
        --pkg libpeas-1.0                                       \
        --pkg gobject-introspection-1.0                         \
        --pkg gee-0.8                                           \
-       --pkg gd-1.0                                            \
        --pkg gtksourceview-3.0                                 \
        --pkg GtkSpell-3.0                                      \
        --pkg gitg-platform-support                             \
-       --girdir "$(top_builddir)/libgd"                        \
        --girdir "$(top_builddir)"                              \
        --vapidir "$(top_srcdir)/vapi"                          \
-       --vapidir "$(top_builddir)/libgd"                       \
        --vapidir "$(top_builddir)/libgitg"                     \
        --vapidir "$(top_builddir)/libgitg-ext"                 \
        --gresources "$(top_srcdir)/gitg/resources/gitg-resources.xml"
 
 gitg_gitg_LDADD =                                              \
-       libgd/libgd.la                                          \
        libgitg/libgitg-1.0.la                                  \
        libgitg-ext/libgitg-ext-1.0.la                          \
        $(GITG_LIBS)                                            \
diff --git a/gitg/gitg-window.vala b/gitg/gitg-window.vala
index bdce09a..9aa545e 100644
--- a/gitg/gitg-window.vala
+++ b/gitg/gitg-window.vala
@@ -23,6 +23,9 @@ namespace Gitg
 [GtkTemplate (ui = "/org/gnome/gitg/ui/gitg-window.ui")]
 public class Window : Gtk.ApplicationWindow, GitgExt.Application, Initable
 {
+       // Do this to pull in config.h before glib.h (for gettext...)
+       private const string version = Gitg.Config.VERSION;
+
        private Settings d_state_settings;
        private Settings d_interface_settings;
        private Repository? d_repository;
@@ -75,7 +78,7 @@ public class Window : Gtk.ApplicationWindow, GitgExt.Application, Initable
        [GtkChild]
        private Gtk.SearchBar d_search_bar;
        [GtkChild]
-       private Gd.TaggedEntry d_search_entry;
+       private Gtk.SearchEntry d_search_entry;
 
        [GtkChild]
        private Gtk.Stack d_main_stack;
diff --git a/gitg/gitg.vala b/gitg/gitg.vala
index e5fde1f..2876f11 100644
--- a/gitg/gitg.vala
+++ b/gitg/gitg.vala
@@ -38,9 +38,6 @@ public class Main
                Environment.set_prgname("gitg");
                Environment.set_application_name(_("gitg"));
 
-               // Make sure to pull in gd symbols since libgd gets linked statically
-               Gd.ensure_types();
-
                Application app = new Application();
                return app.run(args);
        }
diff --git a/gitg/history/gitg-history-paned.vala b/gitg/history/gitg-history-paned.vala
index 7f3e4a0..afe8567 100644
--- a/gitg/history/gitg-history-paned.vala
+++ b/gitg/history/gitg-history-paned.vala
@@ -42,12 +42,6 @@ class Paned : Gitg.AnimatedPaned
        private Gtk.Stack d_stack_panel;
 
        [GtkChild]
-       private Gd.StyledTextRenderer d_renderer_commit_list_author;
-
-       [GtkChild]
-       private Gd.StyledTextRenderer d_renderer_commit_list_author_date;
-
-       [GtkChild]
        private Gtk.ScrolledWindow d_scrolled_window_commit_list;
 
        public Gtk.Orientation inner_orientation
@@ -157,9 +151,6 @@ class Paned : Gitg.AnimatedPaned
                                        "inner_orientation",
                                        SettingsBindFlags.GET);
 
-               d_renderer_commit_list_author.add_class("dim-label");
-               d_renderer_commit_list_author_date.add_class("dim-label");
-
                d_stack_switcher_panels.set_stack(d_stack_panel);
        }
 
diff --git a/gitg/resources/ui/gitg-commit-submodule-history-view.ui 
b/gitg/resources/ui/gitg-commit-submodule-history-view.ui
index 578f475..d7d5934 100644
--- a/gitg/resources/ui/gitg-commit-submodule-history-view.ui
+++ b/gitg/resources/ui/gitg-commit-submodule-history-view.ui
@@ -43,7 +43,7 @@
                 <property name="resizable">True</property>
                 <property name="fixed-width">180</property>
                 <child>
-                  <object class="GdStyledTextRenderer" id="renderer_commit_list_author">
+                  <object class="GtkCellRendererText" id="renderer_commit_list_author">
                     <property name="ellipsize">end</property>
                   </object>
                   <attributes>
@@ -59,7 +59,7 @@
                 <property name="resizable">True</property>
                 <property name="fixed-width">150</property>
                 <child>
-                  <object class="GdStyledTextRenderer" id="renderer_commit_list_author_date">
+                  <object class="GtkCellRendererText" id="renderer_commit_list_author_date">
                     <property name="ellipsize">end</property>
                   </object>
                   <attributes>
@@ -79,4 +79,4 @@
       </object>
     </child>
   </template>
-</interface>
\ No newline at end of file
+</interface>
diff --git a/gitg/resources/ui/gitg-history-paned.ui b/gitg/resources/ui/gitg-history-paned.ui
index 5f2df60..3f0e37f 100644
--- a/gitg/resources/ui/gitg-history-paned.ui
+++ b/gitg/resources/ui/gitg-history-paned.ui
@@ -112,7 +112,7 @@
                     <property name="resizable">True</property>
                     <property name="fixed-width">180</property>
                     <child>
-                      <object class="GdStyledTextRenderer" id="d_renderer_commit_list_author">
+                      <object class="GtkCellRendererText" id="renderer_commit_list_author">
                         <property name="ellipsize">end</property>
                       </object>
                       <attributes>
@@ -128,7 +128,7 @@
                     <property name="resizable">True</property>
                     <property name="fixed-width">150</property>
                     <child>
-                      <object class="GdStyledTextRenderer" id="d_renderer_commit_list_author_date">
+                      <object class="GtkCellRendererText" id="renderer_commit_list_author_date">
                         <property name="ellipsize">end</property>
                       </object>
                       <attributes>
diff --git a/gitg/resources/ui/gitg-window.ui b/gitg/resources/ui/gitg-window.ui
index b6955e9..7882273 100644
--- a/gitg/resources/ui/gitg-window.ui
+++ b/gitg/resources/ui/gitg-window.ui
@@ -211,11 +211,9 @@
                     <property name="can_focus">False</property>
                     <property name="show-close-button">False</property>
                     <child>
-                      <object class="GdTaggedEntry" id="d_search_entry">
+                      <object class="GtkSearchEntry" id="d_search_entry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="invisible_char">●</property>
-                        <property name="invisible_char_set">True</property>
                         <property name="width-request">500</property>
                         <signal name="changed" handler="search_entry_changed" swapped="no"/>
                       </object>
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 2592a26..9807321 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -30,8 +30,6 @@ gitg/history/gitg-history-refs-list.c
 gitg/preferences/gitg-preferences-commit.c
 gitg/preferences/gitg-preferences-history.c
 gitg/preferences/gitg-preferences-interface.c
-libgd/libgd/gd-header-bar.c
-libgd/libgd/gd-stack-switcher.c
 libgitg/gitg-authentication-dialog.c
 libgitg/gitg-date.c
 libgitg/gitg-diff-view.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]