GitLab repository storage has been migrated to hashed layout. Please contact Infrastructure team if you notice any issues with repositories or hooks.

Commit 9318a3ba authored by Johannes Schmid's avatar Johannes Schmid

fix HEAD

parent 2280e1d8
2006-05-08 Johannes Schmid <jhs@cvs.gnome.org>
* configure.in:
* gdl/Makefile.am:
* gdl/gdl-tools.c:
* gdl/gdl-tools.h:
* gdl/gdl.h:
* idl/.cvsignore:
* idl/GDL.idl:
* idl/Makefile.am:
* idl/editor-buffer.idl:
* idl/editor-gutter.idl:
* idl/symbol-browser.idl:
* symbol-browser-control/.cvsignore:
* symbol-browser-control/GNOME_Development_SymbolBrowser.server.in:
* symbol-browser-control/Makefile.am:
* symbol-browser-control/factory.c:
* symbol-browser-control/gnome-symbol-browser.xml:
* symbol-browser-control/pixmaps/.cvsignore:
* symbol-browser-control/pixmaps/Makefile.am:
* symbol-browser-control/pixmaps/sv_class.xpm:
* symbol-browser-control/pixmaps/sv_enum.xpm:
* symbol-browser-control/pixmaps/sv_enumerator.xpm:
* symbol-browser-control/pixmaps/sv_function.xpm:
* symbol-browser-control/pixmaps/sv_macro.xpm:
* symbol-browser-control/pixmaps/sv_private_fun.xpm:
* symbol-browser-control/pixmaps/sv_private_var.xpm:
* symbol-browser-control/pixmaps/sv_protected_fun.xpm:
* symbol-browser-control/pixmaps/sv_protected_var.xpm:
* symbol-browser-control/pixmaps/sv_public_fun.xpm:
* symbol-browser-control/pixmaps/sv_public_var.xpm:
* symbol-browser-control/pixmaps/sv_static_fun.xpm:
* symbol-browser-control/pixmaps/sv_static_var.xpm:
* symbol-browser-control/pixmaps/sv_struct.xpm:
* symbol-browser-control/pixmaps/sv_typedef.xpm:
* symbol-browser-control/pixmaps/sv_unknown.xpm:
* symbol-browser-control/pixmaps/sv_variable.xpm:
* symbol-browser-control/symbol-browser-cobject.c:
* symbol-browser-control/symbol-browser-cobject.h:
* symbol-browser-control/symbol-browser.c:
* symbol-browser-control/symbol-browser.h:
* symbol-browser-control/tagmanager/.cvsignore:
* symbol-browser-control/tagmanager/Makefile.am:
* symbol-browser-control/tagmanager/args.c:
* symbol-browser-control/tagmanager/args.h:
* symbol-browser-control/tagmanager/asm.c:
* symbol-browser-control/tagmanager/asp.c:
* symbol-browser-control/tagmanager/awk.c:
* symbol-browser-control/tagmanager/beta.c:
* symbol-browser-control/tagmanager/c.c:
* symbol-browser-control/tagmanager/cobol.c:
* symbol-browser-control/tagmanager/ctags.c:
* symbol-browser-control/tagmanager/ctags.h:
* symbol-browser-control/tagmanager/debug.c:
* symbol-browser-control/tagmanager/debug.h:
* symbol-browser-control/tagmanager/eiffel.c:
* symbol-browser-control/tagmanager/entry.c:
* symbol-browser-control/tagmanager/entry.h:
* symbol-browser-control/tagmanager/fortran.c:
* symbol-browser-control/tagmanager/general.h:
* symbol-browser-control/tagmanager/get.c:
* symbol-browser-control/tagmanager/get.h:
* symbol-browser-control/tagmanager/include/.cvsignore:
* symbol-browser-control/tagmanager/include/Makefile.am:
* symbol-browser-control/tagmanager/include/tm_file_entry.h:
* symbol-browser-control/tagmanager/include/tm_project.h:
* symbol-browser-control/tagmanager/include/tm_source_file.h:
* symbol-browser-control/tagmanager/include/tm_symbol.h:
* symbol-browser-control/tagmanager/include/tm_tag.h:
* symbol-browser-control/tagmanager/include/tm_tagmanager.h:
* symbol-browser-control/tagmanager/include/tm_work_object.h:
* symbol-browser-control/tagmanager/include/tm_workspace.h:
* symbol-browser-control/tagmanager/keyword.c:
* symbol-browser-control/tagmanager/keyword.h:
* symbol-browser-control/tagmanager/lisp.c:
* symbol-browser-control/tagmanager/lua.c:
* symbol-browser-control/tagmanager/main.h:
* symbol-browser-control/tagmanager/make.c:
* symbol-browser-control/tagmanager/options.c:
* symbol-browser-control/tagmanager/options.h:
* symbol-browser-control/tagmanager/parse.c:
* symbol-browser-control/tagmanager/parse.h:
* symbol-browser-control/tagmanager/parsers.h:
* symbol-browser-control/tagmanager/pascal.c:
* symbol-browser-control/tagmanager/perl.c:
* symbol-browser-control/tagmanager/php.c:
* symbol-browser-control/tagmanager/python.c:
* symbol-browser-control/tagmanager/read.c:
* symbol-browser-control/tagmanager/read.h:
* symbol-browser-control/tagmanager/regex.c:
* symbol-browser-control/tagmanager/rexx.c:
* symbol-browser-control/tagmanager/ruby.c:
* symbol-browser-control/tagmanager/scheme.c:
* symbol-browser-control/tagmanager/sh.c:
* symbol-browser-control/tagmanager/slang.c:
* symbol-browser-control/tagmanager/sort.c:
* symbol-browser-control/tagmanager/sort.h:
* symbol-browser-control/tagmanager/strlist.c:
* symbol-browser-control/tagmanager/strlist.h:
* symbol-browser-control/tagmanager/tcl.c:
* symbol-browser-control/tagmanager/tm_file_entry.c:
* symbol-browser-control/tagmanager/tm_project.c:
* symbol-browser-control/tagmanager/tm_source_file.c:
* symbol-browser-control/tagmanager/tm_symbol.c:
* symbol-browser-control/tagmanager/tm_tag.c:
* symbol-browser-control/tagmanager/tm_tagmanager.c:
* symbol-browser-control/tagmanager/tm_work_object.c:
* symbol-browser-control/tagmanager/tm_workspace.c:
* symbol-browser-control/tagmanager/vim.c:
* symbol-browser-control/tagmanager/vstring.c:
* symbol-browser-control/tagmanager/vstring.h:
* symbol-browser-control/tagmanager/yacc.c:
* symbol-browser-control/test-symbol-browser-ui.xml:
* symbol-browser-control/test-symbol-browser.c:
Created gdl-no-gnome branch:
- remove symbol-browser-control (deprecated)
- Add conditional compile for GNOME/Bonobo
Revert changes from gdl-no-gnome in HEAD
* symbol-browser-control: Removed deprecated directory
2006-04-28 Johannes Schmid <jhs@cvs.gnome.org>
......
......@@ -34,19 +34,17 @@ AC_SUBST(GDL_VERSION)
SNAPSHOT=0_`date +%Y%m%d_%H%M%S`_cvs
AC_SUBST(SNAPSHOT)
GTK_REQUIRED=2.6.0
GNOME_REQUIRED=2.8.0
GTK_REQUIRED=2.3.0
GNOME_REQUIRED=2.5.0
BONOBOUI_REQUIRED=2.2.0
XML_REQUIRED=2.2.8
LIBGLADE_REQUIRED=2.0.0
GNOME_VFS_REQUIRED=2.10.0
AC_SUBST(GTK_REQUIRED)
AC_SUBST(GNOME_REQUIRED)
AC_SUBST(BONOBOUI_REQUIRED)
AC_SUBST(XML_REQUIRED)
AC_SUBST(LIBGLADE_REQUIRED)
AC_SUBST(GNOME_VFS_REQUIRED)
AM_MAINTAINER_MODE
......@@ -72,47 +70,20 @@ AC_SUBST(DEPRECATED_FLAGS)
dnl ***************
dnl GTK Libraries
dnl GNOME Libraries
dnl ***************
PKG_CHECK_MODULES(GDL_DEPENDENCIES,
gtk+-2.0 >= $GTK_REQUIRED
libglade-2.0 >= $LIBGLADE_REQUIRED)
AC_SUBST(GDL_DEPENDENCIES_CFLAGS)
AC_SUBST(GDL_DEPENDENCIES_LIBS)
PKG_CHECK_MODULES(XML, libxml-2.0 >= $XML_REQUIRED)
AC_SUBST(XML_CFLAGS)
AC_SUBST(XML_LIBS)
dnl ****************
dnl GNOME Libraries
dnl ****************
AC_ARG_ENABLE(gnome,
[ --disable-gnome Compile without gnome support],
[ if test "$enableval" = "no"; then
user_disabled_gnome=1
fi ],
[ user_disabled_gnome=0 ])
AC_MSG_CHECKING(if gnome is disabled)
if test "$user_disabled_gnome" = 1; then
AC_MSG_RESULT(yes)
gnome="no"
else
AC_MSG_RESULT(no)
PKG_CHECK_MODULES(GNOME,
[libgnomeui-2.0 >= $GNOME_REQUIRED,
gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED],
[gnome="yes"],
[gnome="no"])
AC_SUBST(GNOME_CFLAGS)
AC_SUBST(GNOME_LIBS)
fi
AM_CONDITIONAL(HAVE_GNOME, [test x$gnome = xyes])
PKG_CHECK_MODULES(GDL_DEPENDENCIES,
gtk+-2.0 >= $GTK_REQUIRED
libgnomeui-2.0 >= $GNOME_REQUIRED
libbonoboui-2.0 >= $BONOBOUI_REQUIRED
libglade-2.0 >= $LIBGLADE_REQUIRED)
AC_SUBST(GDL_DEPENDENCIES_CFLAGS)
AC_SUBST(GDL_DEPENDENCIES_LIBS)
# marshal and enum generators
GLIB_GENMARSHAL="`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`"
......@@ -146,11 +117,3 @@ po/Makefile.in
gdl.spec
gdl-1.0.pc
])
echo "-------------------------------------------------------------------"
if [ test x$gnome = xyes ]; then
echo "Building with GNOME support: .....................YES"
else
echo "Building with GNOME support: .....................NO"
fi
echo "-------------------------------------------------------------------"
......@@ -4,8 +4,7 @@ INCLUDES = \
-DGDL_IMAGESDIR=\""$(gdl_images_dir)"\" \
-I$(includedir) -I$(top_srcdir) \
$(WARN_CFLAGS) $(DEPRECATED_FLAGS) \
$(GDL_DEPENDENCIES_CFLAGS) $(XML_CFLAGS) \
$(GNOME_CFLAGS)
$(GDL_DEPENDENCIES_CFLAGS) $(XML_CFLAGS)
lib_LTLIBRARIES = libgdl-1.la
......@@ -24,6 +23,7 @@ CLEANFILES = \
libgdl_headers = \
gdl.h \
gdl-tools.h \
gdl-combo-button.h \
gdl-dock-object.h \
gdl-dock-master.h \
gdl-dock.h \
......@@ -34,19 +34,16 @@ libgdl_headers = \
gdl-dock-layout.h \
gdl-dock-placeholder.h \
gdl-dock-bar.h \
gdl-combo-button.h \
gdl-stock.h
if HAVE_GNOME
libgdl_headers += \
gdl-icons.h \
gdl-recent.h
endif
gdl-recent.h \
gdl-stock.h
libgdl_1_la_SOURCES = \
$(libgdl_headers) \
gdl-i18n.h \
gdl-i18n.c \
gdl-tools.c \
gdl-combo-button.c \
gdl-dock-object.c \
gdl-dock-master.c \
gdl-dock.c \
......@@ -59,29 +56,19 @@ libgdl_1_la_SOURCES = \
gdl-dock-layout.c \
gdl-dock-placeholder.c \
gdl-dock-bar.c \
gdl-combo-button.c \
gdl-icons.c \
gdl-recent.c \
gdl-stock.c \
libgdltypebuiltins.h \
libgdltypebuiltins.c \
libgdlmarshal.h \
libgdlmarshal.c
if HAVE_GNOME
libgdl_1_la_SOURCES += \
gdl-icons.c \
gdl-recent.c
endif
libgdl_1_la_LIBADD = \
$(GDL_DEPENDENCIES_LIBS) \
$(XML_LIBS) \
$(GNOME_LIBS)
noinst_PROGRAMS=test-dock test-combo-button
$(XML_LIBS)
if HAVE_GNOME
noinst_PROGRAMS += test-dataview
endif
noinst_PROGRAMS=test-dock test-dataview test-combo-button
test_dock_sources=test-dock.c
test_dock_LDADD=libgdl-1.la $(XML_LIBS)
......
......@@ -25,6 +25,8 @@
#define __GDL_TOOLS_H__
#include <glib.h>
#include <gtk/gtkwidget.h>
#include <bonobo/bonobo-ui-component.h>
/* FIXME: Toggle this */
......@@ -172,6 +174,14 @@ typedef struct _GdlPixmap {
#define GDL_PIXMAP(path,fname) { (path), (fname), NULL }
#define GDL_PIXMAP_END { NULL, NULL, NULL }
/* Takes an array of pixmaps, terminated by GDL_PIXMAP_END, and loads into uic */
void gdl_pixmaps_update (BonoboUIComponent *uic,
const char *pixmap_dir,
GdlPixmap *pixcache);
GtkWidget *gdl_button_new_with_stock_image (const char *text,
const char *stock_id);
G_END_DECLS
#endif
......@@ -32,6 +32,8 @@
#include <gdl/gdl-dock-paned.h>
#include <gdl/gdl-dock-notebook.h>
#include <gdl/gdl-dock-tablabel.h>
#include <gdl/gdl-recent.h>
#include <gdl/gdl-icons.h>
#include <gdl/gdl-combo-button.h>
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment