applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't use libgnome in typing-break (#443554)

Browse source 
svn path=/trunk/; revision=7690
This commit is contained in:
Ross Burton 2007-06-05 15:44:40 +00:00
parent a84a68182a
commit 9843f45f54
5 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2007-06-05 Ross Burton <ross@openedhand.com>
* configure.in:
Call pkgconfig specifically for the typing break applet.
2007-06-04 Rodrigo Moya <rodrigo@gnome-db.org>
* configure.in:

1
configure.in
View file

@ -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

6
typing-break/ChangeLog
View file

@ -1,3 +1,9 @@
2007-06-05 Ross Burton <ross@openedhand.com>
* main.c:
* Makefile.am:
Don't use libgnome (#443554). Also clean up dist rules.
2007-02-02 William Jon McCann <mccann@jhu.edu>
* drw-break-window.c: (drw_break_window_class_init),

15
typing-break/Makefile.am
View file

@ -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)

6
typing-break/main.c
View file

@ -24,7 +24,6 @@
#include <glib/gi18n.h>
#include <gdk/gdkx.h>
#include <gtk/gtk.h>
#include <libgnomeui/libgnomeui.h>
#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.");