GNOME.org
 

gdl r498 - in trunk: . docs/reference gdl po

Author: jhs
Date: Tue Sep  2 08:22:11 2008
New Revision: 498
URL: http://svn.gnome.org/viewvc/gdl?rev=498&view=rev

Log:
2008-09-02  Johannes Schmid  <jhs gnome org>

        * Makefile.am:
        * configure.in:
        * docs/reference/gdl-sections.txt:
        * docs/reference/gdl.types:
        * gdl-gnome-1.0.pc.in:
        * gdl/Makefile.am:
        * gdl/gdl-data-frame.c:
        * gdl/gdl-data-frame.h:
        * gdl/gdl-data-model-test.c:
        * gdl/gdl-data-model-test.h:
        * gdl/gdl-data-model.c:
        * gdl/gdl-data-model.h:
        * gdl/gdl-data-row.c:
        * gdl/gdl-data-row.h:
        * gdl/gdl-data-view.c:
        * gdl/gdl-data-view.h:
        * gdl/test-dataview.c:
        Removed old and unused API and thus fixed
        #513845 â Port gdl to gio



Removed:
   trunk/gdl-gnome-1.0.pc.in
   trunk/gdl/gdl-data-frame.c
   trunk/gdl/gdl-data-frame.h
   trunk/gdl/gdl-data-model-test.c
   trunk/gdl/gdl-data-model-test.h
   trunk/gdl/gdl-data-model.c
   trunk/gdl/gdl-data-model.h
   trunk/gdl/gdl-data-row.c
   trunk/gdl/gdl-data-row.h
   trunk/gdl/gdl-data-view.c
   trunk/gdl/gdl-data-view.h
   trunk/gdl/test-dataview.c
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in
   trunk/docs/reference/gdl-sections.txt
   trunk/docs/reference/gdl.types
   trunk/gdl/Makefile.am
   trunk/po/ChangeLog
   trunk/po/POTFILES.in

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Tue Sep  2 08:22:11 2008
@@ -11,10 +11,6 @@
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gdl-1.0.pc 
 
-if HAVE_GNOME
-pkgconfig_DATA += gdl-gnome-1.0.pc
-endif
-
 CLEANFILES = gdl-1.0.pc intltool-extract intltool-merge intltool-update
 
 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Sep  2 08:22:11 2008
@@ -32,14 +32,10 @@
 AC_SUBST(SNAPSHOT)
 
 GTK_REQUIRED=2.12.0
-GNOME_REQUIRED=2.6.0
 XML_REQUIRED=2.2.8
 LIBGLADE_REQUIRED=2.0.0
-GNOME_VFS_REQUIRED=2.6.0
-GCONF_REQUIRED=2.0.0
 
 AC_SUBST(GTK_REQUIRED)
-AC_SUBST(GNOME_REQUIRED)
 AC_SUBST(XML_REQUIRED)
 AC_SUBST(LIBGLADE_REQUIRED)
 
@@ -74,38 +70,6 @@
 AC_SUBST(GDL_DEPENDENCIES_CFLAGS)
 AC_SUBST(GDL_DEPENDENCIES_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 ])
-
-DEPRECATED_FLAGS=""
-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,
-		gconf-2.0 >= $GCONF_REQUIRED],
-		[gnome="yes"],
-		[gnome="no"])
-	AC_SUBST(GNOME_CFLAGS)
-	AC_SUBST(GNOME_LIBS)
-fi
-
-AM_CONDITIONAL(HAVE_GNOME, [test x$gnome = xyes])
-
 if test x$MAINT = x; then
 	DEPRECATED_FLAGS="-DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED"
 	AC_SUBST(DEPRECATED_FLAGS)
@@ -169,5 +133,4 @@
 docs/reference/Makefile
 gdl.spec
 gdl-1.0.pc
-gdl-gnome-1.0.pc
 ])

Modified: trunk/docs/reference/gdl-sections.txt
==============================================================================
--- trunk/docs/reference/gdl-sections.txt	(original)
+++ trunk/docs/reference/gdl-sections.txt	Tue Sep  2 08:22:11 2008
@@ -71,23 +71,6 @@
 </SECTION>
 
 <SECTION>
-<FILE>gdl-icons</FILE>
-<TITLE>GdlIcons</TITLE>
-GdlIcons
-gdl_icons_new
-gdl_icons_get_folder_icon
-gdl_icons_get_uri_icon
-gdl_icons_get_mime_icon
-<SUBSECTION Standard>
-GDL_ICONS
-GDL_IS_ICONS
-GDL_TYPE_ICONS
-gdl_icons_get_type
-GDL_ICONS_CLASS
-GDL_IS_ICONS_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>gdl-dock-item</FILE>
 GdlDockItemBehavior
 GdlDockItemFlags

Modified: trunk/docs/reference/gdl.types
==============================================================================
--- trunk/docs/reference/gdl.types	(original)
+++ trunk/docs/reference/gdl.types	Tue Sep  2 08:22:11 2008
@@ -1,6 +1,5 @@
 gdl_dock_layout_get_type
 gdl_dock_master_get_type
-gdl_icons_get_type
 gdl_dock_item_get_type
 gdl_dock_get_type
 gdl_dock_object_get_type

Modified: trunk/gdl/Makefile.am
==============================================================================
--- trunk/gdl/Makefile.am	(original)
+++ trunk/gdl/Makefile.am	Tue Sep  2 08:22:11 2008
@@ -4,7 +4,6 @@
 	-I$(includedir) -I$(top_srcdir)			\
 	$(WARN_CFLAGS) $(DEPRECATED_FLAGS)		\
 	$(GDL_DEPENDENCIES_CFLAGS) $(XML_CFLAGS) 	\
-	$(GNOME_CFLAGS)					\
 	$(EXTRA_CPPFLAGS)
 
 lib_LTLIBRARIES = libgdl-1.la
@@ -66,30 +65,10 @@
 
 libgdl_1_la_LIBADD = \
 	$(GDL_DEPENDENCIES_LIBS) \
-	$(XML_LIBS) \
-	$(GNOME_LIBS)
+	$(XML_LIBS)
 
 libgdl_1_la_LDFLAGS = $(EXTRA_LDFLAGS)
 
-libgdl_gnome_headers = \
-	gdl-icons.h
-
-if HAVE_GNOME
-lib_LTLIBRARIES += libgdl-gnome-1.la
-endif
-
-libgdl_gnome_1_la_SOURCES = \
-	$(libgdl_gnome_headers) \
-	gdl-icons.c
-
-libgdl_gnome_1_la_LIBADD = \
-	libgdl-1.la \
-	$(GDL_DEPENDENCIES_LIBS) \
-	$(XML_LIBS) \
-	$(GNOME_LIBS)
-	
-libgdl_gnome_1_la_LDFLAGS = $(EXTRA_LDFLAGS)
-
 noinst_PROGRAMS=test-dock test-combo-button
 
 test_dock_sources=test-dock.c
@@ -98,36 +77,11 @@
 test_combo_button_SOURCES = test-combo-button.c
 test_combo_button_LDADD = libgdl-1.la
 
-if HAVE_GNOME
-	
-noinst_PROGRAMS += test-dataview
-
-test_dataview_SOURCES = \
-	gdl-data-view.h \
-	gdl-data-view.c \
-	gdl-data-frame.h \
-	gdl-data-frame.c \
-	gdl-data-model.h \
-	gdl-data-model.c \
-	gdl-data-model-test.h \
-	gdl-data-model-test.c \
-	gdl-data-row.h \
-	gdl-data-row.c \
-	test-dataview.c
-
-test_dataview_LDADD = libgdl-1.la libgdl-gnome-1.la
-
-endif
-
 libgdlincludedir = $(includedir)/libgdl-1.0/gdl
 libgdlinclude_HEADERS = \
 	$(libgdl_headers) \
 	libgdltypebuiltins.h
 
-libgdl_gnomeincludedir = $(includedir)/libgdl-1.0/gdl
-libgdl_gnomeinclude_HEADERS = \
-	$(libgdl_gnome_headers)
-
 gladedir = $(datadir)/gdl/glade
 glade_DATA = layout.glade
 

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Tue Sep  2 08:22:11 2008
@@ -1,4 +1,3 @@
-gdl/gdl-data-view.c
 gdl/gdl-dock-item-grip.c
 gdl/gdl-dock-item.c
 gdl/gdl-dock-layout.c
@@ -10,6 +9,5 @@
 gdl/gdl-dock-tablabel.c
 gdl/gdl-dock-bar.c
 gdl/gdl-dock.c
-gdl/gdl-icons.c
 gdl/gdl-switcher.c
 gdl/layout.glade
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]