[maemo-commits] [maemo-commits] r8420 - in projects/haf/trunk/maemo-launcher: . debian launcher

[From: www-data at stage.maemo.org]

Author: guillem
Date: 2006-11-28 18:32:06 +0200 (Tue, 28 Nov 2006)
New Revision: 8420

Modified:
   projects/haf/trunk/maemo-launcher/ChangeLog
   projects/haf/trunk/maemo-launcher/configure.ac
   projects/haf/trunk/maemo-launcher/debian/changelog
   projects/haf/trunk/maemo-launcher/launcher/booster_gtk.c
Log:
Initialize Xft by calling its constructors. (Fixes: NB#17937)


Modified: projects/haf/trunk/maemo-launcher/ChangeLog
===================================================================
--- projects/haf/trunk/maemo-launcher/ChangeLog	2006-11-28 16:27:29 UTC (rev 8419)
+++ projects/haf/trunk/maemo-launcher/ChangeLog	2006-11-28 16:32:06 UTC (rev 8420)
@@ -1,3 +1,9 @@
+2006-11-28  Guillem Jover  <guillem.jover at nokia.com>
+
+	* configure.ac (GTK_DEPENDS): Add xft.
+	* launcher/booster_gtk.c (booster_gtk_preinit): Call XftInit and
+	XftInitFtLibrary.
+
 2006-11-20  Guillem Jover  <guillem.jover at nokia.com>
 
 	* configure.ac (BOOSTER_GTK_LIBS) [hildon_booster]: Link against

Modified: projects/haf/trunk/maemo-launcher/configure.ac
===================================================================
--- projects/haf/trunk/maemo-launcher/configure.ac	2006-11-28 16:27:29 UTC (rev 8419)
+++ projects/haf/trunk/maemo-launcher/configure.ac	2006-11-28 16:32:06 UTC (rev 8420)
@@ -65,6 +65,7 @@
 GTK_DEPENDS="
 	gtk+-2.0 >= 2.6.4
 	fontconfig
+	xft
 	pangoxft
 "
 HILDON_DEPENDS="$GTK_DEPENDS

Modified: projects/haf/trunk/maemo-launcher/debian/changelog
===================================================================
--- projects/haf/trunk/maemo-launcher/debian/changelog	2006-11-28 16:27:29 UTC (rev 8419)
+++ projects/haf/trunk/maemo-launcher/debian/changelog	2006-11-28 16:32:06 UTC (rev 8420)
@@ -2,6 +2,7 @@
 
   * New Upstream Release.
     - Link against libstdc++. (Fixes: NB#47726)
+    - Initialize Xft by calling its constructors. (Fixes: NB#17937)
 
  -- Guillem Jover <guillem.jover at nokia.com>  Mon, 20 Nov 2006 15:21:39 +0200
 

Modified: projects/haf/trunk/maemo-launcher/launcher/booster_gtk.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/booster_gtk.c	2006-11-28 16:27:29 UTC (rev 8419)
+++ projects/haf/trunk/maemo-launcher/launcher/booster_gtk.c	2006-11-28 16:32:06 UTC (rev 8420)
@@ -31,6 +31,7 @@
 #include <gtk/gtk.h>
 #include <fontconfig/fontconfig.h>
 #include <pango/pangoxft.h>
+#include <X11/Xft/Xft.h>
 
 #include "booster.h"
 #include "booster_gtk.h"
@@ -141,11 +142,23 @@
   timer = g_timer_new();
 #endif
 
+  /* This one is actually called from XftInit, but we should not assume
+     indirect dependencies. */
   if (!FcInit())
     error("FcInit() failed");
 
   debug("FcInit() took %f seconds\n", g_timer_elapsed(timer, NULL));
 
+  if (!XftInit(0))
+    error("XftInit() failed");
+
+  debug("XftInit() took %f seconds\n", g_timer_elapsed(timer, NULL));
+
+  if (!XftInitFtLibrary())
+    error("XftInitFtLibrary() failed");
+
+  debug("XftInitFtLibrary() took %f seconds\n", g_timer_elapsed(timer, NULL));
+
   if (!gtk_parse_args(argc, argv))
     error("gtk_parse_args() failed");