2008-02-28 Saleem Abdulrasool <compnerd@compnerd.org>
* configure.ac, src/init.c, src/main.c, src/Makefile.am: Remove
libgnome dependency.
gsynaptics/trunk/configure.ac (diff) gsynaptics/trunk/ChangeLog (diff)
gsynaptics/trunk/src/init.c (diff) gsynaptics/trunk/src/main.c (diff) gsynaptics/trunk/src/Makefile.am (diff)| @@ -18,14 +18,14 @@ | ||
| 18 | 18 | # Checks for libraries. |
| 19 | 19 | AM_PATH_GTK_2_0(2.6.0) |
| 20 | 20 | |
| 21 | -PKG_CHECK_MODULES(GNOME, libgnomeui-2.0) | |
| 22 | -AC_SUBST(GNOME_CFLAGS) | |
| 23 | -AC_SUBST(GNOME_LIBS) | |
| 24 | - | |
| 25 | 21 | PKG_CHECK_MODULES(GLADE2, libglade-2.0) |
| 26 | 22 | AC_SUBST(GLADE2_CFLAGS) |
| 27 | 23 | AC_SUBST(GLADE2_LIBS) |
| 28 | 24 | |
| 25 | +PKG_CHECK_MODULES(GCONF2, gconf-2.0) | |
| 26 | +AC_SUBST(GCONF2_CFLAGS) | |
| 27 | +AC_SUBST(GCONF2_LIBS) | |
| 28 | + | |
| 29 | 29 | GETTEXT_PACKAGE=gsynaptics |
| 30 | 30 | AC_SUBST(GETTEXT_PACKAGE) |
| 31 | 31 | AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext package]) |
| @@ -1,3 +1,8 @@ | ||
| 1 | +2008-02-28 Saleem Abdulrasool <compnerd@compnerd.org> | |
| 2 | + | |
| 3 | + * configure.ac, src/init.c, src/main.c, src/Makefile.am: Remove | |
| 4 | + libgnome dependency. | |
| 5 | + | |
| 1 | 6 | 2007-11-29 Hiroyuki Ikezoe <poincare@ikezoe.net> |
| 2 | 7 | |
| 3 | 8 | * configure.ac: version 0.9.13. |
| @@ -22,7 +22,7 @@ | ||
| 22 | 22 | # include <config.h> |
| 23 | 23 | #endif |
| 24 | 24 | |
| 25 | -#include <gnome.h> | |
| 25 | +#include <glib/gi18n.h> | |
| 26 | 26 | #include <gconf/gconf-client.h> |
| 27 | 27 | |
| 28 | 28 | #include "gsynaptics.h" |
| @@ -91,10 +91,7 @@ | ||
| 91 | 91 | bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); |
| 92 | 92 | textdomain (GETTEXT_PACKAGE); |
| 93 | 93 | |
| 94 | - gnome_program_init ("gsynaptics-init", VERSION, | |
| 95 | - LIBGNOMEUI_MODULE, argc, argv, | |
| 96 | - GNOME_PARAM_APP_DATADIR, NULL, | |
| 97 | - NULL); | |
| 94 | + gtk_init (&argc, &argv); | |
| 98 | 95 | |
| 99 | 96 | synaptics = g_synaptics_new (); |
| 100 | 97 |
| @@ -22,7 +22,7 @@ | ||
| 22 | 22 | # include <config.h> |
| 23 | 23 | #endif |
| 24 | 24 | |
| 25 | -#include <gnome.h> | |
| 25 | +#include <glib/gi18n.h> | |
| 26 | 26 | #include <glade/glade.h> |
| 27 | 27 | #include <gconf/gconf-client.h> |
| 28 | 28 |
| @@ -683,7 +683,7 @@ | ||
| 683 | 683 | |
| 684 | 684 | gtk_window_set_default_size (GTK_WINDOW (widget), 400, -1); |
| 685 | 685 | |
| 686 | - path = gnome_pixmap_file ("touchpad.png"); | |
| 686 | + path = g_build_filename (DATADIR "/pixmaps", "touchpad.png"); | |
| 687 | 687 | if (path) |
| 688 | 688 | { |
| 689 | 689 | icon_pixbuf = gdk_pixbuf_new_from_file (path, NULL); |
| @@ -712,10 +712,7 @@ | ||
| 712 | 712 | bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); |
| 713 | 713 | textdomain (GETTEXT_PACKAGE); |
| 714 | 714 | |
| 715 | - gnome_program_init ("gsynaptics", VERSION, | |
| 716 | - LIBGNOMEUI_MODULE, argc, argv, | |
| 717 | - GNOME_PARAM_APP_DATADIR, DATADIR, | |
| 718 | - NULL); | |
| 715 | + gtk_init (&argc, &argv); | |
| 719 | 716 | |
| 720 | 717 | synaptics = g_synaptics_new (); |
| 721 | 718 | if (!g_synaptics_is_available(synaptics)) |
| @@ -3,8 +3,8 @@ | ||
| 3 | 3 | -DDATADIR=\""$(datadir)/$(PACKAGE)"\" \ |
| 4 | 4 | -DHELPDATADIR=\""$(datadir)"\" \ |
| 5 | 5 | $(GTK_CFLAGS) \ |
| 6 | - $(GNOME_CFLAGS) \ | |
| 7 | 6 | $(GLADE2_CFLAGS) \ |
| 7 | + $(GCONF2_CFLAGS) \ | |
| 8 | 8 | $(AM_CFLAGS) |
| 9 | 9 | |
| 10 | 10 | gsynaptics_SOURCES = \ |
| @@ -15,8 +15,8 @@ | ||
| 15 | 15 | |
| 16 | 16 | gsynaptics_LDADD = \ |
| 17 | 17 | $(GTK_LIBS) \ |
| 18 | - $(GNOME_LIBS) \ | |
| 19 | - $(GLADE2_LIBS) | |
| 18 | + $(GLADE2_LIBS) \ | |
| 19 | + $(GCONF2_LIBS) | |
| 20 | 20 | |
| 21 | 21 | gsynaptics_init_SOURCES = \ |
| 22 | 22 | gsynaptics-conf.h \ |
| @@ -25,11 +25,14 @@ | ||
| 25 | 25 | gsynaptics.c gsynaptics.h |
| 26 | 26 | |
| 27 | 27 | gsynaptics_init_CFLAGS = \ |
| 28 | + $(GTK_CFLAGS) \ | |
| 28 | 29 | $(GLIB_CFLAGS) \ |
| 29 | 30 | $(GNOME_CFLAGS) \ |
| 31 | + $(GCONF2_CFLAGS) \ | |
| 30 | 32 | $(AM_CFLAGS) |
| 31 | 33 | |
| 32 | 34 | gsynaptics_init_LDADD = \ |
| 35 | + $(GTK_LIBS) \ | |
| 33 | 36 | $(GLIB_LIBS) \ |
| 34 | - $(GNOME_LIBS) | |
| 35 | - | |
| 37 | + $(GNOME_LIBS) \ | |
| 38 | + $(GCONF2_LIBS) |