[maemo-commits] [maemo-commits] r15102 - in projects/haf/trunk/hildon-initscripts: . debian

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-01-17 19:32:51 +0200 (Thu, 17 Jan 2008)
New Revision: 15102

Modified:
   projects/haf/trunk/hildon-initscripts/ChangeLog
   projects/haf/trunk/hildon-initscripts/configure
   projects/haf/trunk/hildon-initscripts/configure.ac
   projects/haf/trunk/hildon-initscripts/debian/changelog
   projects/haf/trunk/hildon-initscripts/osso-gtk.defs
Log:
  * Improved GTK+ theme validity check
  * Fixes: NB#79037


Modified: projects/haf/trunk/hildon-initscripts/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-initscripts/ChangeLog	2008-01-17 15:58:40 UTC (rev 15101)
+++ projects/haf/trunk/hildon-initscripts/ChangeLog	2008-01-17 17:32:51 UTC (rev 15102)
@@ -1,3 +1,8 @@
+2008-01-17  Gabriel Schulhof <gabriel.schulhof at nokia.com>
+
+	* Improved GTK+ theme validity check
+	* Fixes: NB#79037
+
 2005-12-02  Guillem Jover  <guillem.jover at nokia.com>
 
 	* configure.ac (AC_INIT, AM_INIT_AUTOMAKE, AC_OUTPUT): Use autoconf

Modified: projects/haf/trunk/hildon-initscripts/configure
===================================================================
--- projects/haf/trunk/hildon-initscripts/configure	2008-01-17 15:58:40 UTC (rev 15101)
+++ projects/haf/trunk/hildon-initscripts/configure	2008-01-17 17:32:51 UTC (rev 15102)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for hildon-initscripts 0.9.11.
+# Generated by GNU Autoconf 2.59 for hildon-initscripts 1.14.
 #
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
@@ -267,8 +267,8 @@
 # Identity of this package.
 PACKAGE_NAME='hildon-initscripts'
 PACKAGE_TARNAME='hildon-initscripts'
-PACKAGE_VERSION='0.9.11'
-PACKAGE_STRING='hildon-initscripts 0.9.11'
+PACKAGE_VERSION='1.14'
+PACKAGE_STRING='hildon-initscripts 1.14'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="run-standalone.sh"
@@ -721,7 +721,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures hildon-initscripts 0.9.11 to adapt to many kinds of systems.
+\`configure' configures hildon-initscripts 1.14 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -783,7 +783,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of hildon-initscripts 0.9.11:";;
+     short | recursive ) echo "Configuration of hildon-initscripts 1.14:";;
    esac
   cat <<\_ACEOF
 
@@ -882,7 +882,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-hildon-initscripts configure 0.9.11
+hildon-initscripts configure 1.14
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -896,7 +896,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by hildon-initscripts $as_me 0.9.11, which was
+It was created by hildon-initscripts $as_me 1.14, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1534,7 +1534,7 @@
 
 # Define the identity of the package.
  PACKAGE='hildon-initscripts'
- VERSION='0.9.11'
+ VERSION='1.14'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2056,7 +2056,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by hildon-initscripts $as_me 0.9.11, which was
+This file was extended by hildon-initscripts $as_me 1.14, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2111,7 +2111,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-hildon-initscripts config.status 0.9.11
+hildon-initscripts config.status 1.14
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

Modified: projects/haf/trunk/hildon-initscripts/configure.ac
===================================================================
--- projects/haf/trunk/hildon-initscripts/configure.ac	2008-01-17 15:58:40 UTC (rev 15101)
+++ projects/haf/trunk/hildon-initscripts/configure.ac	2008-01-17 17:32:51 UTC (rev 15102)
@@ -1,4 +1,4 @@
-AC_INIT([hildon-initscripts], [0.9.11])
+AC_INIT([hildon-initscripts], [1.14])
 AC_PREREQ([2.59])
 AC_CONFIG_SRCDIR([run-standalone.sh])
 

Modified: projects/haf/trunk/hildon-initscripts/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-initscripts/debian/changelog	2008-01-17 15:58:40 UTC (rev 15101)
+++ projects/haf/trunk/hildon-initscripts/debian/changelog	2008-01-17 17:32:51 UTC (rev 15102)
@@ -1,3 +1,10 @@
+hildon-initscripts (1.14-1) unstable; urgency=low
+
+  * Improved GTK+ theme validity check
+  * Fixes: NB#79037
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Thu, 17 Jan 2008 19:15:45 +0200
+
 hildon-initscripts (1.13-1) unstable; urgency=low
 
   * Added at-spi startup and shutdown.

Modified: projects/haf/trunk/hildon-initscripts/osso-gtk.defs
===================================================================
--- projects/haf/trunk/hildon-initscripts/osso-gtk.defs	2008-01-17 15:58:40 UTC (rev 15101)
+++ projects/haf/trunk/hildon-initscripts/osso-gtk.defs	2008-01-17 17:32:51 UTC (rev 15102)
@@ -2,6 +2,21 @@
 # osso-gtk.defs - Gtk, Pango, IM definitions for all applications 
 # using Gtk in AF.
 
+validate_theme() # $1 = theme name
+{
+  THEMES_DIR=/usr/share/themes
+  if test -d ${THEMES_DIR}/$1; then
+    if test -f ${THEMES_DIR}/$1/gtk-2.0/gtkrc; then
+      if test -f ${THEMES_DIR}/$1/gtk-2.0/gtkrc.maemo_af_desktop; then
+        if test -f ${THEMES_DIR}/$1/matchbox/theme.xml; then
+          return 0
+        fi
+      fi
+    fi
+  fi
+  return 1
+}
+
 if [ "x$USER" = "xroot" ]; then
   # do not create files or directories as root
   DONOTCREATE=1
@@ -39,7 +54,7 @@
   DEFAULTMBTHEME=$THEMEFILE
 
   # if theme directory does not exist, use 'default' theme
-  if [ ! -d /usr/share/themes/$THEMEFILE ]; then
+  if ! validate_theme $THEMEFILE; then
 
     if [ "x$DONOTCREATE" = "x" ]; then
       # set GTK theme