[gnome-builder/document-manager] Gtk: Use GtkSidebar now that we are depending on gtk+ 3.15.2



commit 11e7bc21ee199116879bb579b1b2db12d729395c
Author: Christian Hergert <christian hergert me>
Date:   Mon Dec 8 16:29:05 2014 -0800

    Gtk: Use GtkSidebar now that we are depending on gtk+ 3.15.2

 src/gnome-builder.mk                      |    3 -
 src/preferences/gb-preferences-window.c   |    2 -
 src/resources/ui/gb-preferences-window.ui |    2 +-
 src/sidebar/gb-sidebar.c                  |  520 -----------------------------
 src/sidebar/gb-sidebar.h                  |   69 ----
 5 files changed, 1 insertions(+), 595 deletions(-)
---
diff --git a/src/gnome-builder.mk b/src/gnome-builder.mk
index c106fef..5cff6b2 100644
--- a/src/gnome-builder.mk
+++ b/src/gnome-builder.mk
@@ -120,8 +120,6 @@ libgnome_builder_la_SOURCES = \
        src/preferences/gb-preferences-page-git.h \
        src/preferences/gb-preferences-page-language.c \
        src/preferences/gb-preferences-page-language.h \
-       src/sidebar/gb-sidebar.c \
-       src/sidebar/gb-sidebar.h \
        src/snippets/gb-source-snippet-chunk.c \
        src/snippets/gb-source-snippet-chunk.h \
        src/snippets/gb-source-snippet-completion-item.c \
@@ -235,7 +233,6 @@ libgnome_builder_la_CFLAGS = \
        -I$(top_srcdir)/src/preferences \
        -I$(top_srcdir)/src/resources \
        -I$(top_builddir)/src/resources \
-       -I$(top_srcdir)/src/sidebar \
        -I$(top_srcdir)/src/snippets \
        -I$(top_srcdir)/src/tabs \
        -I$(top_srcdir)/src/tree \
diff --git a/src/preferences/gb-preferences-window.c b/src/preferences/gb-preferences-window.c
index f5398f5..571edef 100644
--- a/src/preferences/gb-preferences-window.c
+++ b/src/preferences/gb-preferences-window.c
@@ -28,7 +28,6 @@
 #include "gb-preferences-page-git.h"
 #include "gb-preferences-page-language.h"
 #include "gb-preferences-window.h"
-#include "gb-sidebar.h"
 
 struct _GbPreferencesWindowPrivate
 {
@@ -171,7 +170,6 @@ gb_preferences_window_class_init (GbPreferencesWindowClass *klass)
   g_type_ensure (GB_TYPE_PREFERENCES_PAGE_GIT);
   g_type_ensure (GB_TYPE_PREFERENCES_PAGE_EDITOR);
   g_type_ensure (GB_TYPE_PREFERENCES_PAGE_LANGUAGE);
-  g_type_ensure (GB_TYPE_SIDEBAR);
 }
 
 static void
diff --git a/src/resources/ui/gb-preferences-window.ui b/src/resources/ui/gb-preferences-window.ui
index 7cc9c06..d2e38d6 100644
--- a/src/resources/ui/gb-preferences-window.ui
+++ b/src/resources/ui/gb-preferences-window.ui
@@ -80,7 +80,7 @@
               </object>
             </child>
             <child>
-              <object class="GbSidebar" id="sidebar">
+              <object class="GtkSidebar" id="sidebar">
                 <property name="visible">True</property>
                 <property name="vexpand">True</property>
                 <property name="stack">stack</property>


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