GNOME.org
 

[gnome-builder] builder:Move gedit and nautilus files out of src and into contrib folder

commit 4b16d4dbfff72e15c88079929d6644c9122cf901
Author: Dimitris Zenios <dimitris zenios gmail com>
Date:   Sat May 9 11:48:55 2015 +0300

    builder:Move gedit and nautilus files out of src and into contrib folder
    
    At the same time updated gedit-menu-stack-switcher using the latest file in gedit trunk
    
    https://bugzilla.gnome.org/show_bug.cgi?id=749153

 configure.ac                                       |   38 +++++++++++--------
 contrib/Makefile.am                                |    2 +-
 contrib/gedit/Makefile.am                          |   22 +++++++++++
 {src => contrib}/gedit/gedit-menu-stack-switcher.c |   29 +++++++++------
 {src => contrib}/gedit/gedit-menu-stack-switcher.h |    5 +--
 contrib/nautilus/Makefile.am                       |   22 +++++++++++
 {src => contrib}/nautilus/nautilus-floating-bar.c  |    0
 {src => contrib}/nautilus/nautilus-floating-bar.h  |    0
 src/Makefile.am                                    |   10 ++---
 9 files changed, 90 insertions(+), 38 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 496d9a2..894be32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -143,22 +143,26 @@ m4_define([gjs_required_version], [1.42.0])
 m4_define([pygobject_required_version], [3.0.0])
 m4_define([devhelp_required_version], [3.16.0])
 
-PKG_CHECK_MODULES(BUILDER, [gtk+-3.0 >= gtk_required_version
-                            gio-2.0 >= glib_required_version
-                            gtksourceview-3.0 >= gtksourceview_required_version
-                            libdevhelp-3.0 >= devhelp_required_version
-                            libgit2-glib-1.0 >= ggit_required_version])
-PKG_CHECK_MODULES(EGG,     [glib-2.0 >= glib_required_version
-                           gtk+-3.0 >= gtk_required_version])
-PKG_CHECK_MODULES(LIBIDE,  [gio-2.0 >= glib_required_version
-                            gio-unix-2.0 >= glib_required_version
-                            gtksourceview-3.0 >= gtksourceview_required_version
-                            libdevhelp-3.0 >= devhelp_required_version
-                            libgit2-glib-1.0 >= ggit_required_version
-                            gjs-1.0 >= gjs_required_version
-                            gjs-internals-1.0 >= gjs_required_version
-                            pygobject-3.0 >= pygobject_required_version])
-PKG_CHECK_MODULES(SEARCH,  [glib-2.0 >= glib_required_version])
+PKG_CHECK_MODULES(BUILDER,  [gtk+-3.0 >= gtk_required_version
+                             gio-2.0 >= glib_required_version
+                             gtksourceview-3.0 >= gtksourceview_required_version
+                             libdevhelp-3.0 >= devhelp_required_version
+                             libgit2-glib-1.0 >= ggit_required_version])
+PKG_CHECK_MODULES(EGG,      [glib-2.0 >= glib_required_version
+                            gtk+-3.0 >= gtk_required_version])
+PKG_CHECK_MODULES(LIBIDE,   [gio-2.0 >= glib_required_version
+                             gio-unix-2.0 >= glib_required_version
+                             gtksourceview-3.0 >= gtksourceview_required_version
+                             libdevhelp-3.0 >= devhelp_required_version
+                             libgit2-glib-1.0 >= ggit_required_version
+                             gjs-1.0 >= gjs_required_version
+                             gjs-internals-1.0 >= gjs_required_version
+                             pygobject-3.0 >= pygobject_required_version])
+PKG_CHECK_MODULES(SEARCH,   [glib-2.0 >= glib_required_version])
+PKG_CHECK_MODULES(GEDIT,    [glib-2.0 >= glib_required_version
+                            gtk+-3.0 >= gtk_required_version])
+PKG_CHECK_MODULES(NAUTILUS, [glib-2.0 >= glib_required_version
+                            gtk+-3.0 >= gtk_required_version])
 
 
 dnl ***********************************************************************
@@ -314,6 +318,8 @@ AC_CONFIG_FILES([
        contrib/Makefile
        contrib/egg/Makefile
        contrib/search/Makefile
+       contrib/gedit/Makefile
+       contrib/nautilus/Makefile
        contrib/libeditorconfig/Makefile
 
        libide/ide-debug.h
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index f1d684f..7c67970 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = search libeditorconfig egg
+SUBDIRS = search gedit nautilus libeditorconfig egg
 
 -include $(top_srcdir)/git.mk
diff --git a/contrib/gedit/Makefile.am b/contrib/gedit/Makefile.am
new file mode 100644
index 0000000..cb7308b
--- /dev/null
+++ b/contrib/gedit/Makefile.am
@@ -0,0 +1,22 @@
+noinst_LTLIBRARIES = libgedit.la
+
+libgedit_la_SOURCES = \
+       gedit-menu-stack-switcher.c \
+       gedit-menu-stack-switcher.h \
+       $(NULL)
+
+libgedit_la_CFLAGS = \
+       $(DEBUG_CFLAGS) \
+       $(OPTIMIZE_CFLAGS) \
+       $(GEDIT_CFLAGS) \
+       $(NULL)
+
+libgedit_la_LIBADD = \
+       $(GEDIT_LIBADD) \
+       $(NULL)
+
+libgedit_la_LDFLAGS = \
+       $(OPTIMIZE_LDFLAGS) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/gedit/gedit-menu-stack-switcher.c b/contrib/gedit/gedit-menu-stack-switcher.c
similarity index 95%
rename from src/gedit/gedit-menu-stack-switcher.c
rename to contrib/gedit/gedit-menu-stack-switcher.c
index d66b409..642d190 100644
--- a/src/gedit/gedit-menu-stack-switcher.c
+++ b/contrib/gedit/gedit-menu-stack-switcher.c
@@ -22,21 +22,22 @@
 #include <config.h>
 #endif
 
+#include "gedit-menu-stack-switcher.h"
+
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include "gedit-menu-stack-switcher.h"
 
 struct _GeditMenuStackSwitcher
 {
-  GtkMenuButton  parent_instance;
-
-  GtkStack      *stack;
-  GtkWidget     *label;
-  GtkWidget     *button_box;
-  GtkWidget     *popover;
-  GHashTable    *buttons;
-  gboolean       in_child_changed;
+  GtkMenuButton parent_instance;
+
+  GtkStack *stack;
+  GtkWidget *label;
+  GtkWidget *button_box;
+  GtkWidget *popover;
+  GHashTable *buttons;
+  gboolean in_child_changed;
 };
 
 enum {
@@ -174,7 +175,6 @@ static void
 add_child (GeditMenuStackSwitcher *switcher,
            GtkWidget              *widget)
 {
-
   GtkWidget *button;
   GList *group;
 
@@ -261,6 +261,11 @@ on_stack_child_removed (GtkStack               *stack,
 {
   GtkWidget *button;
 
+  g_signal_handlers_disconnect_by_func (widget, on_title_icon_visible_updated, switcher);
+  g_signal_handlers_disconnect_by_func (widget, on_title_icon_visible_updated, switcher);
+  g_signal_handlers_disconnect_by_func (widget, on_title_icon_visible_updated, switcher);
+  g_signal_handlers_disconnect_by_func (widget, on_position_updated, switcher);
+
   button = g_hash_table_lookup (switcher->buttons, widget);
   gtk_container_remove (GTK_CONTAINER (switcher->button_box), button);
   g_hash_table_remove (switcher->buttons, widget);
@@ -398,8 +403,8 @@ gedit_menu_stack_switcher_class_init (GeditMenuStackSwitcherClass *klass)
   g_object_class_install_property (object_class,
                                    PROP_STACK,
                                    g_param_spec_object ("stack",
-                                                        _("Stack"),
-                                                        _("Stack"),
+                                                        "Stack",
+                                                        "Stack",
                                                         GTK_TYPE_STACK,
                                                         G_PARAM_READWRITE |
                                                         G_PARAM_CONSTRUCT));
diff --git a/src/gedit/gedit-menu-stack-switcher.h b/contrib/gedit/gedit-menu-stack-switcher.h
similarity index 89%
rename from src/gedit/gedit-menu-stack-switcher.h
rename to contrib/gedit/gedit-menu-stack-switcher.h
index c0b07b0..cb249d5 100644
--- a/src/gedit/gedit-menu-stack-switcher.h
+++ b/contrib/gedit/gedit-menu-stack-switcher.h
@@ -25,10 +25,9 @@
 
 G_BEGIN_DECLS
 
-#define GEDIT_TYPE_MENU_STACK_SWITCHER             (gedit_menu_stack_switcher_get_type())
+#define GEDIT_TYPE_MENU_STACK_SWITCHER (gedit_menu_stack_switcher_get_type())
 
-G_DECLARE_FINAL_TYPE (GeditMenuStackSwitcher, gedit_menu_stack_switcher,
-                      GEDIT, MENU_STACK_SWITCHER, GtkMenuButton)
+G_DECLARE_FINAL_TYPE (GeditMenuStackSwitcher, gedit_menu_stack_switcher, GEDIT, MENU_STACK_SWITCHER, 
GtkMenuButton)
 
 GtkWidget *  gedit_menu_stack_switcher_new           (void);
 
diff --git a/contrib/nautilus/Makefile.am b/contrib/nautilus/Makefile.am
new file mode 100644
index 0000000..ac11732
--- /dev/null
+++ b/contrib/nautilus/Makefile.am
@@ -0,0 +1,22 @@
+noinst_LTLIBRARIES = libnautilus.la
+
+libnautilus_la_SOURCES = \
+       nautilus-floating-bar.c \
+       nautilus-floating-bar.h \
+       $(NULL)
+
+libnautilus_la_CFLAGS = \
+       $(DEBUG_CFLAGS) \
+       $(OPTIMIZE_CFLAGS) \
+       $(NAUTILUS_CFLAGS) \
+       $(NULL)
+
+libnautilus_la_LIBADD = \
+       $(NAUTILUS_LIBADD) \
+       $(NULL)
+
+libnautilus_la_LDFLAGS = \
+       $(OPTIMIZE_LDFLAGS) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/nautilus/nautilus-floating-bar.c b/contrib/nautilus/nautilus-floating-bar.c
similarity index 100%
rename from src/nautilus/nautilus-floating-bar.c
rename to contrib/nautilus/nautilus-floating-bar.c
diff --git a/src/nautilus/nautilus-floating-bar.h b/contrib/nautilus/nautilus-floating-bar.h
similarity index 100%
rename from src/nautilus/nautilus-floating-bar.h
rename to contrib/nautilus/nautilus-floating-bar.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 6bf1507..3681aa1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -72,16 +72,12 @@ libgnome_builder_la_SOURCES = \
        editor/gb-editor-workspace.h \
        gd/gd-tagged-entry.c \
        gd/gd-tagged-entry.h \
-       gedit/gedit-menu-stack-switcher.c \
-       gedit/gedit-menu-stack-switcher.h \
        html/gb-html-document.c \
        html/gb-html-document.h \
        html/gb-html-view.c \
        html/gb-html-view.h \
        keybindings/gb-keybindings.c \
        keybindings/gb-keybindings.h \
-       nautilus/nautilus-floating-bar.c \
-       nautilus/nautilus-floating-bar.h \
        preferences/gb-preferences-page-editor.c \
        preferences/gb-preferences-page-editor.h \
        preferences/gb-preferences-page-experimental.c \
@@ -182,6 +178,8 @@ libgnome_builder_la_LIBADD = \
        $(OPTIMIZE_LDFLAGS) \
        $(top_builddir)/libide/libide-1.0.la \
        $(top_builddir)/contrib/egg/libegg.la \
+       $(top_builddir)/contrib/gedit/libgedit.la \
+       $(top_builddir)/contrib/nautilus/libnautilus.la \
        -lm
 
 libgnome_builder_la_CFLAGS = \
@@ -200,10 +198,8 @@ libgnome_builder_la_CFLAGS = \
        -I$(srcdir)/documents \
        -I$(srcdir)/editor \
        -I$(srcdir)/gd \
-       -I$(srcdir)/gedit \
        -I$(srcdir)/html \
        -I$(srcdir)/keybindings \
-       -I$(srcdir)/nautilus \
        -I$(srcdir)/preferences \
        -I$(srcdir)/project-tree \
        -I$(srcdir)/resources \
@@ -218,6 +214,8 @@ libgnome_builder_la_CFLAGS = \
        -I$(top_builddir)/libide \
        -I$(top_srcdir)/libide \
        -I$(top_srcdir)/contrib/egg \
+       -I$(top_srcdir)/contrib/gedit \
+       -I$(top_srcdir)/contrib/nautilus \
        $(NULL)
 
 gnome_builder_SOURCES = main.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]