summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey V. Udaltsov <svu@gnome.org>2009-05-12 23:34:56 +0100
committerSergey V. Udaltsov <svu@gnome.org>2009-05-12 23:34:56 +0100
commit5e7848d3a08d916141629b15bcf386145e11c92e (patch)
tree62cdf03a1471ffda37e11e15a5969e70493a444b
parentd29dc9b82e96f40350c490c905c81044aa4d456c (diff)
downloadlibgnomekbd-5e7848d3a08d916141629b15bcf386145e11c92e.tar.gz
Eliminating last glade bits,
In relation to http://bugzilla.gnome.org/show_bug.cgi?id=582256
-rw-r--r--ChangeLog5
-rw-r--r--libgnomekbd/Makefile.am2
-rw-r--r--test/gkbd-indicator-test.c2
3 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ab28f29..52dfaff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-12 svu
+
+ * libgnomekbd/Makefile.am, test/gkbd-indicator-test.c: eliminating
+ last glade bits, http://bugzilla.gnome.org/show_bug.cgi?id=582256
+
2009-03-13 svu
* configure.in, NEWS: preparing 2.26.0
diff --git a/libgnomekbd/Makefile.am b/libgnomekbd/Makefile.am
index 6d2fa49..cde0e40 100644
--- a/libgnomekbd/Makefile.am
+++ b/libgnomekbd/Makefile.am
@@ -10,7 +10,6 @@ common_CFLAGS = \
-I$(top_srcdir)/intl \
-DSYS_PLUGIN_DIR=\"$(libdir)/gnomekbd/\" \
-DG_LOG_DOMAIN=\"GnomeKbdIndicator\" \
- -DGLADEDIR=\"$(gladedir)\" \
-DDATADIR=\"$(datadir)\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DLIBDIR=\"$(libdir)\"
@@ -77,7 +76,6 @@ noinst_HEADERS = gkbd-indicator-plugin-manager.h \
EXTRA_DIST = gkbd-indicator-marshal.list \
gkbd-keyboard-drawing-marshal.list \
- $(glade_DATA) \
$(schema_in_files)
GLIB_GENMARSHAL = $(shell pkg-config --variable=glib_genmarshal glib-2.0)
diff --git a/test/gkbd-indicator-test.c b/test/gkbd-indicator-test.c
index 5f1cac8..f902e80 100644
--- a/test/gkbd-indicator-test.c
+++ b/test/gkbd-indicator-test.c
@@ -33,7 +33,6 @@
#include <gdk/gdkx.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include "X11/XKBlib.h"
@@ -50,7 +49,6 @@ main (int argc, char **argv)
/* Different data dir defs in g-a and g-c-c */
gtk_init (&argc, &argv);
- glade_gnome_init ();
mainwin = gtk_window_new (GTK_WINDOW_TOPLEVEL);