From 9843f45f543e1701a2ebc9dc9f110eb3611e5509 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 5 Jun 2007 15:44:40 +0000 Subject: [PATCH] Don't use libgnome in typing-break (#443554) svn path=/trunk/; revision=7690 --- ChangeLog | 5 +++++ configure.in | 1 + typing-break/ChangeLog | 6 ++++++ typing-break/Makefile.am | 15 +++++---------- typing-break/main.c | 6 ++---- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 276946431..3768806dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-06-05 Ross Burton + + * configure.in: + Call pkgconfig specifically for the typing break applet. + 2007-06-04 Rodrigo Moya * configure.in: diff --git a/configure.in b/configure.in index a0e007f59..a7d52bea9 100644 --- a/configure.in +++ b/configure.in @@ -112,6 +112,7 @@ PKG_CHECK_MODULES(SOUND_CAPPLET, esound gstreamer-0.10 gstreamer-plugins-base-0. SOUND_CAPPLET_LIBS="$SOUND_CAPPLET_LIBS -lgstaudio-0.10 -lgstinterfaces-0.10" AC_SUBST(SOUND_CAPPLET_LIBS) PKG_CHECK_MODULES(METACITY, libmetacity-private) +PKG_CHECK_MODULES(TYPING, gconf-2.0 gtk+-2.0) dnl dnl Check for Xft version 2; we build in extra functionality to the font capplet diff --git a/typing-break/ChangeLog b/typing-break/ChangeLog index e1abd0e22..bd0e36add 100644 --- a/typing-break/ChangeLog +++ b/typing-break/ChangeLog @@ -1,3 +1,9 @@ +2007-06-05 Ross Burton + + * main.c: + * Makefile.am: + Don't use libgnome (#443554). Also clean up dist rules. + 2007-02-02 William Jon McCann * drw-break-window.c: (drw_break_window_class_init), diff --git a/typing-break/Makefile.am b/typing-break/Makefile.am index b64a4ced4..a01cd68b4 100644 --- a/typing-break/Makefile.am +++ b/typing-break/Makefile.am @@ -18,20 +18,19 @@ gnome_typing_monitor_CPPFLAGS = \ -DIMAGEDIR=\"$(pkgdatadir)/pixmaps\" \ $(AM_CPPFLAGS) gnome_typing_monitor_CFLAGS = \ - @GNOME_CFLAGS@ \ + @TYPING_CFLAGS@ \ $(AM_CFLAGS) -gnome_typing_monitor_LDADD = @GNOME_LIBS@ @SCREENSAVER_LIBS@ -gnome_typing_monitor_LDFLAGS = -export-dynamic +gnome_typing_monitor_LDADD = @TYPING_LIBS@ @SCREENSAVER_LIBS@ imagedir = $(pkgdatadir)/pixmaps -image_DATA = stop.png bar.png bar-red.png bar-green.png bar-disabled.png ocean-stripes.png +dist_image_DATA = stop.png bar.png bar-red.png bar-green.png bar-disabled.png ocean-stripes.png # Themeable application icon icondir = $(datadir)/icons/hicolor/48x48/apps -icon_DATA = typing-monitor.png +dist_icon_DATA = typing-monitor.png svgicondir = $(datadir)/icons/hicolor/scalable/apps -svgicon_DATA = typing-monitor.svg +dist_svgicon_DATA = typing-monitor.svg gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor install-data-hook: @-if test -z "$(DESTDIR)"; then \ @@ -41,7 +40,3 @@ install-data-hook: echo "*** Icon cache not updated. After install, run this:"; \ echo "*** $(gtk_update_icon_cache)"; \ fi - -EXTRA_DIST = $(image_DATA) \ - $(icon_DATA) \ - $(svgicon_DATA) diff --git a/typing-break/main.c b/typing-break/main.c index cfa62e8bc..6d31e5ee5 100644 --- a/typing-break/main.c +++ b/typing-break/main.c @@ -24,7 +24,6 @@ #include #include #include -#include #include "drw-selection.h" #include "drwright.h" @@ -62,6 +61,8 @@ main (int argc, char *argv[]) bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); + gtk_init (&argc, &argv); + i = 1; while (i < argc) { const gchar *arg = argv[i]; @@ -84,9 +85,6 @@ main (int argc, char *argv[]) g_set_application_name (_("Typing Monitor")); gtk_window_set_default_icon_name ("typing-monitor"); - gnome_program_init ("typing-break", VERSION, LIBGNOMEUI_MODULE, - argc, argv, NULL); - selection = drw_selection_start (); if (!drw_selection_is_master (selection)) { g_message ("The typing monitor is already running, exiting.");