[evolution-exchange] Bug #592568 - Remove libglade dependency



commit de0ba0e3aedc8b83c12989aca108280f953c3d6e
Author: Milan Crha <mcrha redhat com>
Date:   Mon Aug 24 11:42:23 2009 +0200

    Bug #592568 - Remove libglade dependency

 configure.ac                              |    5 +-
 po/POTFILES.in                            |    8 -
 storage/Makefile.am                       |   13 -
 storage/exchange-change-password.c        |  145 -------
 storage/exchange-change-password.glade    |  243 -----------
 storage/exchange-change-password.h        |   16 -
 storage/exchange-delegates.glade          |  628 -----------------------------
 storage/exchange-folder-tree.glade        |   92 -----
 storage/exchange-oof.glade                |  530 ------------------------
 storage/exchange-passwd-expiry.glade      |   91 -----
 storage/exchange-permissions-dialog.glade |  578 --------------------------
 11 files changed, 1 insertions(+), 2348 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4635625..5291123 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,6 @@ m4_define([gtk_minimum_version], [2.10.0])
 m4_define([eds_minimum_version], [eex_version])
 m4_define([gconf_minimum_version], [2.0.0])             # XXX Just a Guess
 m4_define([libbonobo_minimum_version], [2.20.3])
-m4_define([libglade_minimum_version], [2.0.0])          # XXX Just a Guess
 m4_define([libxml_minimum_version], [2.0.0])            # XXX Just a Guess
 m4_define([libsoup_minimum_version], [2.3.0])
 
@@ -141,7 +140,6 @@ PKG_CHECK_MODULES(GNOME_PLATFORM,
 	 gtk+-2.0 >= gtk_minimum_version
 	 gconf-2.0 >= gconf_minimum_version
 	 libbonobo-2.0 >= libbonobo_minimum_version
-	 libglade-2.0 >= libglade_minimum_version
 	 libxml-2.0 >= libxml_minimum_version
 	 libsoup-2.4 >= libsoup_minimum_version])
 
@@ -172,7 +170,6 @@ dnl AC_DEFINE(GNOME_DISABLE_DEPRECATED,1,[No deprecated gnome functions])
 dnl AC_DEFINE(BONOBO_DISABLE_DEPRECATED,1,[No deprecated bonobo functions])
 dnl AC_DEFINE(BONOBO_UI_DISABLE_DEPRECATED,1,[No deprecated bonoboui functions])
 dnl AC_DEFINE(GCONF_DISABLE_DEPRECATED,1,[No deprecated gconf functions])
-dnl AC_DEFINE(LIBGLADE_DISABLE_DEPRECATED,1,[No deprecated libglade functions])
 
 AC_EGREP_HEADER(socklen_t, sys/socket.h, :, AC_DEFINE(socklen_t, int, [Define to "int" if socklen_t is not defined]))
 
@@ -230,7 +227,7 @@ AC_SUBST(CAMEL_CFLAGS)
 PKG_CHECK_MODULES(MAIL, libecal-$EDS_API_VERSION)
 AC_SUBST(MAIL_CFLAGS)
 
-PKG_CHECK_MODULES(EXCHANGE_STORAGE, evolution-shell evolution-plugin libedataserverui-$EDS_API_VERSION libedata-book-$EDS_API_VERSION libedata-cal-$EDS_API_VERSION libsoup-2.4 libglade-2.0 camel-provider-$EDS_API_VERSION)
+PKG_CHECK_MODULES(EXCHANGE_STORAGE, evolution-shell evolution-plugin libedataserverui-$EDS_API_VERSION libedata-book-$EDS_API_VERSION libedata-cal-$EDS_API_VERSION libsoup-2.4 libxml-2.0 camel-provider-$EDS_API_VERSION)
 AC_SUBST(EXCHANGE_STORAGE_CFLAGS)
 AC_SUBST(EXCHANGE_STORAGE_LIBS)
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6b1b9d4..4095e2d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -14,17 +14,9 @@ camel/camel-stub.c
 mail/mail-stub-exchange.c
 storage/GNOME_Evolution_Exchange_Storage.server.in.in
 storage/exchange-autoconfig-wizard.c
-storage/exchange-autoconfig-wizard.glade
-storage/exchange-change-password.c
-storage/exchange-change-password.glade
 storage/exchange-component.c
 storage/exchange-config-listener.c
-storage/exchange-delegates.glade
-storage/exchange-folder-tree.glade
 storage/exchange-migrate.c
-storage/exchange-oof.glade
-storage/exchange-passwd-expiry.glade
-storage/exchange-permissions-dialog.glade
 storage/exchange-storage.c
 storage/main.c
 storage/ximian-connector-setup.c
diff --git a/storage/Makefile.am b/storage/Makefile.am
index 3d90152..a483048 100644
--- a/storage/Makefile.am
+++ b/storage/Makefile.am
@@ -11,7 +11,6 @@ AM_CPPFLAGS = \
 	-DSYSCONFDIR=\""$(sysconfdir)"\"  \
 	-DDATADIR=\""$(datadir)"\"	  \
 	-DLIBDIR=\""$(datadir)"\"	  \
-	-DCONNECTOR_GLADEDIR=\""$(gladedir)"\" \
 	-DCONNECTOR_IMAGESDIR=\""$(imagesdir)"\" \
 	-DCONNECTOR_UIDIR=\""$(uidir)"\" \
 	-DCONNECTOR_LOCALEDIR=\""$(localedir)\""
@@ -30,8 +29,6 @@ evolution_exchange_storage_SOURCES = \
 	exchange-component.h \
 	exchange-config-listener.c \
 	exchange-config-listener.h \
-	exchange-change-password.c \
-	exchange-change-password.h \
 	exchange-migrate.c \
 	exchange-migrate.h \
 	exchange-storage.c \
@@ -107,15 +104,6 @@ images_DATA = \
 	exchange-delegates-48.png \
 	exchange-oof-48.png
 
-gladedir   = $(CONNECTOR_DATADIR)/glade
-glade_DATA = \
-	exchange-change-password.glade \
-	exchange-delegates.glade \
-	exchange-oof.glade \
-	exchange-permissions-dialog.glade \
-	exchange-folder-tree.glade \
-	exchange-passwd-expiry.glade
-
 uidir   = $(CONNECTOR_DATADIR)/ui
 ui_DATA = ximian-connector.xml
 
@@ -125,7 +113,6 @@ DISTCLEANFILES =  \
 EXTRA_DIST = \
 	$(server_in_files) \
 	$(images_DATA) \
-	$(glade_DATA) \
 	$(ui_DATA)
 
 -include $(top_srcdir)/git.mk



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