[seahorse-plugins] Get rid of libglade.
- From: Adam Schreiber <sadam src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [seahorse-plugins] Get rid of libglade.
- Date: Thu, 26 Nov 2009 22:43:37 +0000 (UTC)
commit 373e908ed16ba19e42dff244cfcc95e571cabf83
Author: Pablo Castellano <pablog ubuntu gmail com>
Date: Sun Aug 23 17:56:11 2009 +0200
Get rid of libglade.
Finish migration from libglade to gtkbuilder.
README | 1 -
agent/Makefile.am | 6 +++---
agent/seahorse-agent-status.c | 1 -
configure.in | 3 +--
libseahorse/Makefile.am | 2 +-
libseahorse/seahorse-passphrase.c | 1 -
plugins/epiphany/Makefile.am | 2 +-
plugins/nautilus/Makefile.am | 4 ++--
8 files changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/README b/README
index 39b8d60..cf31276 100644
--- a/README
+++ b/README
@@ -39,7 +39,6 @@ if your distro requires this.
- DBUS 0.35 (or later)
- GPGME 1.x
- GnuPG 1.2.x or 1.4.x
- - libglade 2.x
- GConf 2.x
- GnomeVFS 2.x
- gnome-keyring 2.19.4 (or later)
diff --git a/agent/Makefile.am b/agent/Makefile.am
index f527827..9cd941d 100644
--- a/agent/Makefile.am
+++ b/agent/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = -I$(top_builddir) \
$(SEAHORSE_CFLAGS) \
$(AGENT_CFLAGS) \
-DDATA_DIR=\""$(datadir)"\" \
- -DSEAHORSE_GLADEDIR=\""$(gladedir)"\" \
+ -DSEAHORSE_UIDIR=\""$(uidir)"\" \
-DLOCALEDIR=\""$(localedir)"\" \
-DPIXMAPSDIR=\""$(pixmapsdir)"\" \
-DLIBCRYPTUI_API_SUBJECT_TO_CHANGE
@@ -30,7 +30,7 @@ man_MANS = seahorse-agent.1
EXTRA_DIST = \
$(man_MANS) \
- $(glade_DATA)
+ $(ui_DATA)
CLEANFILES = \
- *.gladep* *.bak
+ *.bak
diff --git a/agent/seahorse-agent-status.c b/agent/seahorse-agent-status.c
index 5411658..02c9887 100644
--- a/agent/seahorse-agent-status.c
+++ b/agent/seahorse-agent-status.c
@@ -26,7 +26,6 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <glade/glade-xml.h>
#include "seahorse-agent.h"
#include "seahorse-gtkstock.h"
diff --git a/configure.in b/configure.in
index a19d76d..6a21af7 100644
--- a/configure.in
+++ b/configure.in
@@ -31,7 +31,7 @@ AC_CHECK_FUNCS(strsep)
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-PKG_CHECK_MODULES(SEAHORSE, libglade-2.0 gconf-2.0 gtk+-2.0 >= 2.10.0 gio-2.0)
+PKG_CHECK_MODULES(SEAHORSE, gconf-2.0 gtk+-2.0 >= 2.10.0 gio-2.0)
AC_MSG_CHECKING([for some Win32 platform])
case "$host" in
@@ -353,7 +353,6 @@ fi
PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], [\
libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
- libglade-2.0 \
glib-2.0 >= $EPIPHANY_LIBGLIB_REQUIRED \
gmodule-2.0 \
gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
diff --git a/libseahorse/Makefile.am b/libseahorse/Makefile.am
index a7badc3..ce76704 100644
--- a/libseahorse/Makefile.am
+++ b/libseahorse/Makefile.am
@@ -62,5 +62,5 @@ ui_DATA = \
seahorse-progress.xml \
seahorse-multi-encrypt.xml
-EXTRA_DIST = $(glade_DATA) \
+EXTRA_DIST = $(ui_DATA) \
seahorse-marshal.list
diff --git a/libseahorse/seahorse-passphrase.c b/libseahorse/seahorse-passphrase.c
index 9ebb6ef..b9feb0b 100644
--- a/libseahorse/seahorse-passphrase.c
+++ b/libseahorse/seahorse-passphrase.c
@@ -40,7 +40,6 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
-#include <glade/glade-xml.h>
#include "seahorse-gpgmex.h"
#include "seahorse-libdialogs.h"
diff --git a/plugins/epiphany/Makefile.am b/plugins/epiphany/Makefile.am
index 0883e0a..7e06b45 100644
--- a/plugins/epiphany/Makefile.am
+++ b/plugins/epiphany/Makefile.am
@@ -48,4 +48,4 @@ extensionini_DATA = $(extensionini_in_files:.ephy-extension.in.in=.ephy-extensio
CLEANFILES = $(extensionini_DATA)
DISTCLEANFILES = $(extensionini_DATA)
-EXTRA_DIST = $(glade_DATA) $(extensionini_in_files)
+EXTRA_DIST = $(extensionini_in_files)
diff --git a/plugins/nautilus/Makefile.am b/plugins/nautilus/Makefile.am
index de73b60..5175e4e 100644
--- a/plugins/nautilus/Makefile.am
+++ b/plugins/nautilus/Makefile.am
@@ -1,4 +1,4 @@
-gladedir = $(datadir)/seahorse/glade/
+uidir = $(datadir)/seahorse/ui
localedir = $(datadir)/locale
INCLUDES = -I$(top_builddir) \
@@ -7,7 +7,7 @@ INCLUDES = -I$(top_builddir) \
$(SEAHORSE_CFLAGS) \
-DLOCALEDIR=\"$(localedir)\" \
-DDATA_DIR=\""$(datadir)"\" \
- -DSEAHORSE_GLADEDIR=\""$(gladedir)"\" \
+ -DSEAHORSE_UIDIR=\""$(uidir)"\" \
-DLIBCRYPTUI_API_SUBJECT_TO_CHANGE
bin_PROGRAMS = seahorse-preferences seahorse-tool
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]