[Xfce4-commits] <squeeze:stephan/ui> Remove the option to disable the toolbar/pathbar at compiletime

[Stephan Arts]

Updating branch refs/heads/stephan/ui
         to e0a63500cbd8a0feb33bfd5d55bd7a513fd39492 (commit)
       from 122a306824e83c1e78f1c6cf313418183bf78a97 (commit)

commit e0a63500cbd8a0feb33bfd5d55bd7a513fd39492
Author: Stephan Arts <stephan at xfce.org>
Date:   Tue Oct 18 18:40:56 2011 +0200

    Remove the option to disable the toolbar/pathbar at compiletime

 configure.in.in   |   20 --------------------
 src/Makefile.am   |   25 ++++++++-----------------
 src/main_window.c |    5 -----
 3 files changed, 8 insertions(+), 42 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 6c0bd27..daefe21 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -92,26 +92,6 @@ fi
 AM_CONDITIONAL([HAVE_PCRE], [test x"$ac_cv_header_pcre_h" = x"yes" -a  x"$ac_cv_lib_pcre_main" = x"yes"])
 
 
-AC_ARG_ENABLE([pathbar],
-   [AC_HELP_STRING([--disable-pathbar], 
-        [Do not compile support for a PathBar (default=enabled)])],
-        [sq_pathbar=$enableval], 
-        [sq_pathbar=yes])
-if test "$sq_pathbar" = "yes"; then
-	AC_DEFINE([ENABLE_PATHBAR], [1], [Define if we should include pathbar support])
-fi
-AM_CONDITIONAL([ENABLE_PATHBAR], [test "$sq_pathbar" = "yes"])
-
-AC_ARG_ENABLE([toolbar],
-   [AC_HELP_STRING([--disable-toolbar], 
-        [Do not compile support for a ToolBar (default=enabled)])],
-        [sq_toolbar=$enableval], 
-        [sq_toolbar=yes])
-if test "$sq_toolbar" = "yes"; then
-	AC_DEFINE([ENABLE_TOOLBAR], [1], [Define if we should include toolbar support])
-fi
-AM_CONDITIONAL([ENABLE_TOOLBAR], [test "$sq_toolbar" = "yes"])
-
 AC_ARG_ENABLE([iter-slices],
    [AC_HELP_STRING([--disable-iter-slices], 
         [Use LSQArchiveIter slices (default=enabled)])],
diff --git a/src/Makefile.am b/src/Makefile.am
index cdeef19..c41c273 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,25 +1,13 @@
 bin_PROGRAMS = squeeze
 
-if ENABLE_PATHBAR
-PATHBAR_FILES = path_bar.c path_bar.h
-else
-PATHBAR_FILES = 
-endif
-
-if ENABLE_TOOLBAR
-TOOLBAR_FILES = tool_bar.c tool_bar.h
-else
-TOOLBAR_FILES =
-endif
-
 squeeze_SOURCES = \
 	main.c main.h \
+    path_bar.c path_bar.h \
+    tool_bar.c tool_bar.h \
 	application.c application.h \
 	main_window.c main_window.h \
 	navigation_bar.c navigation_bar.h \
 	notebook.c notebook.h \
-	$(TOOLBAR_FILES) \
-	$(PATHBAR_FILES) \
 	settings.c settings.h \
 	archive_store.c archive_store.h \
 	message_dialog.c message_dialog.h \
@@ -28,7 +16,6 @@ squeeze_SOURCES = \
 	new_dialog.c new_dialog.h \
 	extract_dialog.c extract_dialog.h \
 	widget_factory.c widget_factory.h 
-#	location_entry.c location_entry.h
 
 squeeze_CFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
@@ -57,12 +44,16 @@ INCLUDES = \
 if MAINTAINER_MODE
 
 DISTCLEANFILES = \
-	throbber-fallback.c
+	throbber-fallback.c \
+	main_window_ui.h
 
 BUILT_SOURCES = \
-	throbber-fallback.c
+	throbber-fallback.c \
+	main_window_ui.h
 
 throbber-fallback.c: $(srcdir)/throbber-fallback.png Makefile
 	(echo "#include \"throbber-fallback.h\"" && gdk-pixbuf-csource --extern --raw --stream --name=sq_throbber_fallback $(srcdir)/throbber-fallback.png) > throbber-fallback.c
 
+main_window_ui.h: main_window_ui.xml
+	xdt-csource --strip-comments --strip-content --static --name=main_window_ui $< > $@
 endif
diff --git a/src/main_window.c b/src/main_window.c
index 1b95e0d..cc87962 100644
--- a/src/main_window.c
+++ b/src/main_window.c
@@ -44,13 +44,8 @@
 #include "archive_store.h"
 #include "navigation_bar.h"
 
-#ifdef ENABLE_PATHBAR
 #include "path_bar.h"
-#endif /* ENABLE_PATHBAR */
-
-#ifdef ENABLE_TOOLBAR
 #include "tool_bar.h"
-#endif /* ENABLE_TOOLBAR */
 
 #include "widget_factory.h"