mousetweaks r237 - in trunk: . src

[gerdk svn gnome org]

Author: gerdk
Date: Mon Aug 18 20:19:59 2008
New Revision: 237
URL: http://svn.gnome.org/viewvc/mousetweaks?rev=237&view=rev

Log:
2008-08-18 Gerd Kohlberger <gerdk svn gnome org>

	* confiure.ac: remove libgnome and libgnomeui dependency
	* src/Makefile.am: use per-file CFLAGS.
	* src/mt-main.c: remove last bits of libgnome and libgnomeui



Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/Makefile.am
   trunk/src/mt-main.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Aug 18 20:19:59 2008
@@ -1,8 +1,7 @@
 AC_PREREQ(2.57)
 AC_INIT([mousetweaks],
 	[2.23.91],
-	[http://bugzilla.gnome.org/enter_bug.cgi?product=mousetweaks], 
-	[mousetweaks])
+	[http://bugzilla.gnome.org/enter_bug.cgi?product=mousetweaks])
 
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_HEADER([config.h])
@@ -16,6 +15,7 @@
 AC_PROG_INSTALL
 AC_HEADER_STDC
 AC_C_CONST
+AM_PROG_CC_C_O
 
 GNOME_COMMON_INIT
 GNOME_COMPILE_WARNINGS([maximum])
@@ -41,9 +41,6 @@
 	libglade-2.0 >= 2.4.0
 	gconf-2.0 >= 2.16.0
 	dbus-glib-1 >= 0.7
-	libpanelapplet-2.0
-	libgnome-2.0
-	libgnomeui-2.0
 	cspi-1.0
 	xcursor
 	xfixes)
@@ -51,15 +48,6 @@
 AC_SUBST(DEPENDENCIES_CFLAGS)
 AC_SUBST(DEPENDENCIES_LIBS)
 
-dnl *** gconf ***
-
-AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
-if test x"$GCONFTOOL" = xno; then
-	AC_MSG_ERROR([gconftool-2 executable not found in your path])
-fi
-
-AM_GCONF_SOURCE_2
-
 dnl *** arguments ***
 
 AC_ARG_ENABLE(pointer-capture,
@@ -80,6 +68,25 @@
   AC_DEFINE(BUILD_DCA, 1, [Build dwell-click applet])
 fi
 
+dnl *** libpanelapplet ***
+
+if test "$build_dca" = yes -o "$build_pca" = yes; then
+	PKG_CHECK_MODULES(PANELAPPLET, libpanelapplet-2.0)
+	AC_SUBST(PANELAPPLET_CFLAGS)
+	AC_SUBST(PANELAPPLET_LIBS)
+fi
+
+dnl *** gconf ***
+
+AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+if test x"$GCONFTOOL" = xno; then
+	AC_MSG_ERROR([gconftool-2 executable not found in your path])
+fi
+
+AM_GCONF_SOURCE_2
+
+dnl *** output ***
+
 AC_OUTPUT([Makefile
 	   src/Makefile
 	   data/Makefile

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Mon Aug 18 20:19:59 2008
@@ -1,8 +1,7 @@
-INCLUDES =				     \
-	$(DEPENDENCIES_CFLAGS)		     \
-	$(DISABLE_DEPRECATED)		     \
-	$(WARN_CFLAGS)			     \
-	-DDATADIR=\"$(datadir)/mousetweaks\" \
+AM_CFLAGS =					\
+	$(DEPENDENCIES_CFLAGS)			\
+	$(WARN_CFLAGS)				\
+	-DDATADIR=\"$(datadir)/mousetweaks\"	\
 	-DLOCALEDIR=\"$(datadir)/locale\"
 
 if BUILD_PCA
@@ -33,21 +32,35 @@
 	mt-cursor-manager.c \
 	mt-cursor-manager.h
 
-mousetweaks_LDADD = $(DEPENDENCIES_LIBS)
-
-dwell_click_applet_SOURCES = \
-	dwell-click-applet.c \
-	mt-common.c	     \
+mousetweaks_CFLAGS =		\
+	$(AM_CFLAGS)		\
+	$(DISABLE_DEPRECATED)
+mousetweaks_LDADD =		\
+	$(DEPENDENCIES_LIBS)
+
+dwell_click_applet_SOURCES =	\
+	dwell-click-applet.c	\
+	mt-common.c		\
 	mt-common.h
 
-dwell_click_applet_LDADD = $(DEPENDENCIES_LIBS)
-
-pointer_capture_applet_SOURCES = \
-	pointer-capture-applet.c \
-	mt-common.c		 \
+dwell_click_applet_CFLAGS =	\
+	$(PANELAPPLET_CFLAGS)	\
+	$(AM_CFLAGS)
+dwell_click_applet_LDADD =	\
+	$(PANELAPPLET_LIBS)	\
+	$(DEPENDENCIES_LIBS)
+
+pointer_capture_applet_SOURCES =	\
+	pointer-capture-applet.c	\
+	mt-common.c			\
 	mt-common.h
 
-pointer_capture_applet_LDADD = $(DEPENDENCIES_LIBS)
+pointer_capture_applet_CFLAGS =	\
+	$(PANELAPPLET_CFLAGS)	\
+	$(AM_CFLAGS)
+pointer_capture_applet_LDADD =	\
+	$(PANELAPPLET_LIBS)	\
+	$(DEPENDENCIES_LIBS)
 
 BUILT_SOURCES = mt-service-glue.h
 

Modified: trunk/src/mt-main.c
==============================================================================
--- trunk/src/mt-main.c	(original)
+++ trunk/src/mt-main.c	Mon Aug 18 20:19:59 2008
@@ -28,9 +28,6 @@
 #include <cspi/spi.h>
 #include <dbus/dbus-glib.h>
 
-#include <libgnome/gnome-program.h>
-#include <libgnomeui/gnome-ui-init.h>
-
 #include "mt-common.h"
 #include "mt-service.h"
 #include "mt-pidfile.h"
@@ -702,7 +699,6 @@
     }
     else {
 	/* Child process */
-	GnomeProgram *program;
 	MTClosure *mt;
 	MtCursorManager *manager;
 	AccessibleEventListener *bl, *ml;
@@ -717,9 +713,8 @@
 	signal (SIGQUIT, signal_handler);
 	signal (SIGHUP, signal_handler);
 
+	gtk_init (&argc, &argv);
 	g_set_application_name ("Mousetweaks");
-	program = gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE,
-				      argc, argv, GNOME_PARAM_NONE);
 
 	mt = mt_closure_init ();
 	if (!mt)
@@ -790,7 +785,6 @@
 	    mt_closure_free (mt);
 	FINISH:
 	    mt_pidfile_remove ();
-	    g_object_unref (program);
 
 	if (spi_leaks)
 	    g_warning ("AT-SPI reported %i leaks", spi_leaks);