[gnome-control-center] Drop font-viewer

[William Jon McCann <mccann src gnome org>]

commit ec8aed3b20f33b813cfab0c4c1fb54009aac7187
Author: William Jon McCann <jmccann redhat com>
Date:   Thu Sep 30 13:52:59 2010 -0400

    Drop font-viewer
    
    Will be moved to another module

 Makefile.am                                 |    4 +-
 configure.ac                                |    3 -
 font-viewer/Makefile.am                     |   48 ---
 font-viewer/font-thumbnailer.c              |  399 ------------------
 font-viewer/font-view.c                     |  609 ---------------------------
 font-viewer/fontilus.schemas.in             |  109 -----
 font-viewer/ftstream-vfs.c                  |  156 -------
 font-viewer/ftstream-vfs.h                  |   28 --
 font-viewer/gnome-font-viewer.desktop.in.in |   14 -
 font-viewer/totem-resources.c               |  123 ------
 font-viewer/totem-resources.h               |   33 --
 typing-break/drw-break-window.c             |   29 +-
 12 files changed, 12 insertions(+), 1543 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 7616e00..9c4d411 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 SUBDIRS = po libgnome-control-center shell panels \
-	  font-viewer help docs
-DIST_SUBDIRS = po font-viewer help shell typing-break docs examples panels libgnome-control-center
+	  help docs
+DIST_SUBDIRS = po help shell typing-break docs examples panels libgnome-control-center
 
 if HAVE_TYPING_BREAK
 SUBDIRS += typing-break
diff --git a/configure.ac b/configure.ac
index 7d2b444..fd44a05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -151,7 +151,6 @@ if $PKG_CONFIG --exists xft ; then
 fi
 
 PKG_CHECK_MODULES(FONT_CAPPLET, $COMMON_MODULES $xft_modules)
-PKG_CHECK_MODULES(FONT_VIEWER, $COMMON_MODULES $xft_modules)
 
 PKG_CHECK_MODULES(AT_CAPPLET, $COMMON_MODULES)
 
@@ -344,8 +343,6 @@ docs/reference/libgnome-control-center/Makefile
 docs/reference/libgnome-control-center/version.xml
 examples/Makefile
 examples/gnome-example-panel.desktop.in
-font-viewer/Makefile
-font-viewer/gnome-font-viewer.desktop.in
 help/Makefile
 libgnome-control-center/Makefile
 libgnome-control-center/libgnome-control-center.pc
diff --git a/typing-break/drw-break-window.c b/typing-break/drw-break-window.c
index fd65c59..6af4a11 100644
--- a/typing-break/drw-break-window.c
+++ b/typing-break/drw-break-window.c
@@ -73,8 +73,8 @@ static gboolean     postpone_sensitize_cb          (DrwBreakWindow      *window)
 static gboolean     clock_timeout_cb               (DrwBreakWindow      *window);
 static void         postpone_clicked_cb            (GtkWidget           *button,
 						    GtkWidget           *window);
-static gboolean     label_expose_event_cb          (GtkLabel            *label,
-						    GdkEventExpose      *event,
+static gboolean     label_draw_event_cb            (GtkLabel            *label,
+						    cairo_t             *cr,
 						    gpointer             user_data);
 static void         label_size_request_cb          (GtkLabel            *label,
 						    GtkRequisition      *requisition,
@@ -237,8 +237,8 @@ drw_break_window_init (DrwBreakWindow *window)
 	gtk_widget_show (priv->break_label);
 
 	g_signal_connect (priv->break_label,
-			  "expose_event",
-			  G_CALLBACK (label_expose_event_cb),
+			  "draw",
+			  G_CALLBACK (label_draw_event_cb),
 			  NULL);
 
 	g_signal_connect_after (priv->break_label,
@@ -260,8 +260,8 @@ drw_break_window_init (DrwBreakWindow *window)
 	gtk_box_pack_start (GTK_BOX (vbox), priv->clock_label, TRUE, TRUE, 8);
 
 	g_signal_connect (priv->clock_label,
-			  "expose_event",
-			  G_CALLBACK (label_expose_event_cb),
+			  "draw",
+			  G_CALLBACK (label_draw_event_cb),
 			  NULL);
 
 	g_signal_connect_after (priv->clock_label,
@@ -543,25 +543,19 @@ postpone_clicked_cb (GtkWidget *button,
 }
 
 static gboolean
-label_expose_event_cb (GtkLabel       *label,
-		       GdkEventExpose *event,
-		       gpointer        user_data)
+label_draw_event_cb (GtkLabel       *label,
+		     cairo_t        *cr,
+		     gpointer        user_data)
 {
 	gint             x, y;
 	GtkWidget       *widget;
 	GdkWindow       *window;
-        cairo_t         *cr;
 
         gtk_label_get_layout_offsets (label, &x, &y);
 
 	widget = GTK_WIDGET (label);
 	window = gtk_widget_get_window (widget);
 
-        cr = gdk_cairo_create (window);
-
-        gdk_cairo_rectangle (cr, &event->area);
-        cairo_clip (cr);
-
         cairo_set_source_rgb (cr, 0, 0, 0);
 
         /* Can't use pango_cairo_show_layout() here as we need to override
@@ -571,13 +565,10 @@ label_expose_event_cb (GtkLabel       *label,
         pango_cairo_layout_path (cr, gtk_label_get_layout (label));
         cairo_fill (cr);
 
-        cairo_destroy (cr);
-
 	gtk_paint_layout (gtk_widget_get_style (widget),
-			  window,
+			  cr,
 			  gtk_widget_get_state (widget),
 			  FALSE,
-			  &event->area,
 			  widget,
 			  "label",
 			  x, y,