[gedit] Port gedit to GtkRevealer



commit 97de04d5f01c36536f2fccaa90ad6ff169c626e1
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Tue Apr 23 17:11:54 2013 +0200

    Port gedit to GtkRevealer

 .gitmodules              |    3 ---
 Makefile.am              |    4 ++--
 configure.ac             |    7 -------
 gedit/gedit-tab.c        |    7 +++----
 gedit/gedit-view-frame.c |    9 ++++-----
 libgd                    |    1 -
 6 files changed, 9 insertions(+), 22 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 25fe07a..44ac8a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ## 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 gedit pixmaps po plugins data docs tests win32 osx
+SUBDIRS = gedit pixmaps po plugins data docs tests win32 osx
 
 if !OS_OSX
 SUBDIRS += help
diff --git a/configure.ac b/configure.ac
index 2d91b31..30f518d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -430,12 +430,6 @@ else
        enable_introspection=no
 fi
 
-# libgd
-LIBGD_INIT([
-       revealer
-       static
-])
-
 AC_CONFIG_FILES([
 Makefile
 data/gedit.desktop.in
@@ -446,7 +440,6 @@ docs/Makefile
 docs/reference/Makefile
 gedit/Makefile
 help/Makefile
-libgd/Makefile
 pixmaps/Makefile
 plugins/Makefile
 plugins/changecase/Makefile
diff --git a/gedit/gedit-tab.c b/gedit/gedit-tab.c
index 5a2e18e..e146f29 100644
--- a/gedit/gedit-tab.c
+++ b/gedit/gedit-tab.c
@@ -32,7 +32,6 @@
 
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include <libgd/gd.h>
 
 #include "gedit-app.h"
 #include "gedit-notebook.h"
@@ -537,7 +536,7 @@ set_info_bar (GeditTab  *tab,
 
        if (info_bar == NULL)
        {
-               gd_revealer_set_reveal_child (GD_REVEALER (tab->priv->info_bar_revealer), FALSE);
+               gtk_revealer_set_reveal_child (GTK_REVEALER (tab->priv->info_bar_revealer), FALSE);
                tab->priv->info_bar = NULL;
        }
        else
@@ -545,7 +544,7 @@ set_info_bar (GeditTab  *tab,
                /* lazy init the reveler */
                if (tab->priv->info_bar_revealer == NULL)
                {
-                       tab->priv->info_bar_revealer = gd_revealer_new ();
+                       tab->priv->info_bar_revealer = gtk_revealer_new ();
                        gtk_widget_show (tab->priv->info_bar_revealer);
                        gtk_box_pack_start (GTK_BOX (tab), tab->priv->info_bar_revealer, FALSE, FALSE, 0);
                }
@@ -563,7 +562,7 @@ set_info_bar (GeditTab  *tab,
                }
 
                gtk_container_add (GTK_CONTAINER (tab->priv->info_bar_revealer), info_bar);
-               gd_revealer_set_reveal_child (GD_REVEALER (tab->priv->info_bar_revealer), TRUE);
+               gtk_revealer_set_reveal_child (GTK_REVEALER (tab->priv->info_bar_revealer), TRUE);
 
                g_object_add_weak_pointer (G_OBJECT (info_bar),
                                           (gpointer *)&tab->priv->info_bar);
diff --git a/gedit/gedit-view-frame.c b/gedit/gedit-view-frame.c
index f690c03..85fb34a 100644
--- a/gedit/gedit-view-frame.c
+++ b/gedit/gedit-view-frame.c
@@ -28,7 +28,6 @@
 #include "gedit-marshal.h"
 #include "gedit-debug.h"
 #include "gedit-utils.h"
-#include <libgd/gd.h>
 
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
@@ -172,7 +171,7 @@ hide_search_widget (GeditViewFrame *frame,
                frame->priv->typeselect_flush_timeout = 0;
        }
 
-       gd_revealer_set_reveal_child (GD_REVEALER (frame->priv->slider), FALSE);
+       gtk_revealer_set_reveal_child (GTK_REVEALER (frame->priv->slider), FALSE);
 
        if (cancel)
        {
@@ -1109,7 +1108,7 @@ start_interactive_search_real (GeditViewFrame *frame)
        GtkTextIter iter;
        GtkTextMark *mark;
 
-       if (gd_revealer_get_reveal_child (GD_REVEALER (frame->priv->slider)))
+       if (gtk_revealer_get_reveal_child (GTK_REVEALER (frame->priv->slider)))
        {
                if (frame->priv->search_mode != frame->priv->request_search_mode)
                {
@@ -1157,7 +1156,7 @@ start_interactive_search_real (GeditViewFrame *frame)
        frame->priv->start_mark = gtk_text_buffer_create_mark (buffer, NULL,
                                                               &iter, FALSE);
 
-       gd_revealer_set_reveal_child (GD_REVEALER (frame->priv->slider), TRUE);
+       gtk_revealer_set_reveal_child (GTK_REVEALER (frame->priv->slider), TRUE);
 
        /* NOTE: we must be very careful here to not have any text before
           focusing the entry because when the entry is focused the text is
@@ -1270,7 +1269,7 @@ gedit_view_frame_init (GeditViewFrame *frame)
        gtk_box_pack_start (GTK_BOX (frame), frame->priv->overlay, TRUE, TRUE, 0);
 
        /* Add slider */
-       frame->priv->slider = gd_revealer_new ();
+       frame->priv->slider = gtk_revealer_new ();
        gtk_container_add (GTK_CONTAINER (frame->priv->slider),
                           create_search_widget (frame));
        gtk_widget_show (frame->priv->slider);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]