diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | capplet/.cvsignore | 2 | ||||
| -rw-r--r-- | libgnomekbd/.cvsignore | 2 | ||||
| -rw-r--r-- | libgnomekbd/gkbd-desktop-config.c | 1 | ||||
| -rw-r--r-- | libgnomekbd/gkbd-indicator-config.c | 5 | ||||
| -rw-r--r-- | libgnomekbd/gkbd-keyboard-config.c | 1 | ||||
| -rw-r--r-- | test/.cvsignore | 2 | ||||
| -rw-r--r-- | test/Makefile.am | 2 | ||||
| -rw-r--r-- | test/gkbd-indicator-test.c | 8 |
9 files changed, 17 insertions, 13 deletions
@@ -1,3 +1,10 @@ +2007-08-05 svu + + * test/gkbd-indicator-test.c, test/Makefile.am, + libgnomekbd/gkbd-keyboard-config.c, libgnomekbd/gkbd-desktop-config.c, + libgnomekbd/gkbd-indicator-config.c: eliminating unneeded libgnomeui, + http://bugzilla.gnome.org/show_bug.cgi?id=463255 + 2007-08-01 svu * configure.in, libgnomekbd/Makefile.am: processing non-standard X diff --git a/capplet/.cvsignore b/capplet/.cvsignore index 41013e3..d5ea908 100644 --- a/capplet/.cvsignore +++ b/capplet/.cvsignore @@ -3,4 +3,6 @@ Makefile.in gkbd-indicator-plugins-capplet gkbd-indicator-plugins-capplet.desktop gkbd-indicator-plugins-capplet.desktop.in +.libs +.deps diff --git a/libgnomekbd/.cvsignore b/libgnomekbd/.cvsignore index 9567442..4ae2094 100644 --- a/libgnomekbd/.cvsignore +++ b/libgnomekbd/.cvsignore @@ -7,4 +7,6 @@ gkbd-indicator-marshal.c gkbd-indicator-marshal.h gkbd-keyboard-drawing-marshal.c gkbd-keyboard-drawing-marshal.h +.libs +.deps diff --git a/libgnomekbd/gkbd-desktop-config.c b/libgnomekbd/gkbd-desktop-config.c index 936ad67..ce33f12 100644 --- a/libgnomekbd/gkbd-desktop-config.c +++ b/libgnomekbd/gkbd-desktop-config.c @@ -25,7 +25,6 @@ #include <X11/keysym.h> #include <glib/gi18n.h> -#include <libgnome/gnome-program.h> #include <gkbd-desktop-config.h> #include <gkbd-config-private.h> diff --git a/libgnomekbd/gkbd-indicator-config.c b/libgnomekbd/gkbd-indicator-config.c index f353f01..124b974 100644 --- a/libgnomekbd/gkbd-indicator-config.c +++ b/libgnomekbd/gkbd-indicator-config.c @@ -26,7 +26,6 @@ #include <glib/gi18n.h> #include <gdk/gdkx.h> -#include <libgnome/gnome-program.h> #include <gkbd-keyboard-config.h> #include <gkbd-indicator-config.h> @@ -212,9 +211,7 @@ gkbd_indicator_config_init (GkbdIndicatorConfig * ind_config, ind_config->icon_theme = gtk_icon_theme_get_default (); - datadir = - gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_APP_DATADIR, - "", FALSE, NULL); + datadir = DATADIR; gtk_icon_theme_append_search_path (ind_config->icon_theme, sp = g_build_filename (g_get_home_dir (), diff --git a/libgnomekbd/gkbd-keyboard-config.c b/libgnomekbd/gkbd-keyboard-config.c index 62a1c9a..923d4ef 100644 --- a/libgnomekbd/gkbd-keyboard-config.c +++ b/libgnomekbd/gkbd-keyboard-config.c @@ -25,7 +25,6 @@ #include <X11/keysym.h> #include <glib/gi18n.h> -#include <libgnome/gnome-program.h> #include <gkbd-keyboard-config.h> #include <gkbd-config-private.h> diff --git a/test/.cvsignore b/test/.cvsignore index 8954104..eb8ffe0 100644 --- a/test/.cvsignore +++ b/test/.cvsignore @@ -3,4 +3,6 @@ Makefile.in gkbd-config-registry-server gkbd-indicator-test gkbd-keyboard-drawing-test +.libs +.deps diff --git a/test/Makefile.am b/test/Makefile.am index aa0d3b0..6645591 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -17,7 +17,6 @@ gkbd_indicator_test_CFLAGS= \ $(GTK_CFLAGS) \ $(LIBGLADE_CFLAGS) \ $(LIBGNOME_CFLAGS) \ - $(LIBGNOMEUI_CFLAGS) \ $(LIBXKLAVIER_CFLAGS) \ -I$(top_srcdir)/intl \ -DSYS_PLUGIN_DIR=\"$(libdir)/gnomekbd/\" \ @@ -29,7 +28,6 @@ gkbd_indicator_test_LDFLAGS= \ $(GTK_LIBS) \ $(LIBGLADE_LIBS) \ $(LIBGNOME_LIBS) \ - $(LIBGNOMEUI_LIBS) \ $(LIBXKLAVIER_LIBS) \ $(top_builddir)/libgnomekbd/libgnomekbd.la \ $(top_builddir)/libgnomekbd/libgnomekbdui.la diff --git a/test/gkbd-indicator-test.c b/test/gkbd-indicator-test.c index 3401d30..120c7f1 100644 --- a/test/gkbd-indicator-test.c +++ b/test/gkbd-indicator-test.c @@ -31,7 +31,8 @@ #include <gdk/gdkscreen.h> #include <gdk/gdkx.h> -#include <gnome.h> +#include <glib/gi18n.h> +#include <gtk/gtk.h> #include <glade/glade.h> #include "X11/XKBlib.h" @@ -48,10 +49,7 @@ main (int argc, char **argv) textdomain (GETTEXT_PACKAGE); /* Different data dir defs in g-a and g-c-c */ - gnome_program_init ("gkbd-indicator-test", VERSION, - LIBGNOMEUI_MODULE, argc, argv, - GNOME_PARAM_APP_DATADIR, DATADIR, NULL); - + gtk_init (&argc, &argv); glade_gnome_init (); mainwin = gtk_window_new (GTK_WINDOW_TOPLEVEL); |