[Pkg-maemo-commits] r30 ./hildon-thumbnail/debian: * Merge with trunk branch.

[Jonny Lamb]

------------------------------------------------------------
revno: 30
committer: Jonny Lamb <jonnylamb at jonnylamb.com>
branch nick: hildon-thumbnail
timestamp: Sun 2007-07-22 22:37:12 +0100
message:
  * Merge with trunk branch.
modified:
  ChangeLog
  debian/changelog
  thumbs/thumber-common.c
    ------------------------------------------------------------
    revno: 4.1.1
    merged: vcs-imports at canonical.com-20070612190220-i5ag5tttjtih2pn0
    committer: tko
    timestamp: Tue 2007-06-12 19:02:20 +0000
    message:
      Add missing g_thread_init() call
      
      2007-06-12  Tommi Komulainen  <tommi.komulainen at nokia.com>
      
      	* thumbs/thumber-common.c (hildon_thumber_main): Call g_thread_init()
      	before g_type_init() or gnome_vfs_init() to avoid GSlice problems.
-------------- next part --------------
=== modified file 'ChangeLog'
--- a/ChangeLog	2007-05-21 14:07:32 +0000
+++ b/ChangeLog	2007-07-22 21:37:12 +0000
@@ -1,8 +1,13 @@
+2007-06-12  Tommi Komulainen  <tommi.komulainen at nokia.com>
+
+	* thumbs/thumber-common.c (hildon_thumber_main): Call g_thread_init()
+	before g_type_init() or gnome_vfs_init() to avoid GSlice problems.
+
 2007-05-21  Adilson Oliveira  <adilson at canonical.com>
 
 	* Changed dependency from libosso-gnomevfs2 to libgnomevfs2.
 
-2006-10-13  Marius Vollmer  <marius.vollmer at nokia.com>2006-10-13  Marius Vollmer  <marius.vollmer at nokia.com>
+2006-10-13  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	Released 0.8-1.
 	

=== modified file 'debian/changelog'
--- a/debian/changelog	2007-06-08 21:39:37 +0000
+++ b/debian/changelog	2007-07-22 21:37:12 +0000
@@ -17,8 +17,9 @@
 
   [ Jonny Lamb ]
   * Updated description in control.
+  * Merge with trunk branch.
 
- -- Jonny Lamb <jonnylamb at jonnylamb.com>  Fri, 08 Jun 2007 22:33:12 +0100
+ -- Jonny Lamb <jonnylamb at jonnylamb.com>  Sun, 22 Jul 2007 22:36:35 +0100
 
 hildon-thumbnail (0.11ubuntu2) UNRELEASED; urgency=low
 

=== modified file 'thumbs/thumber-common.c'
--- a/thumbs/thumber-common.c	2007-04-24 17:59:32 +0000
+++ b/thumbs/thumber-common.c	2007-06-12 19:02:20 +0000
@@ -82,6 +82,8 @@
     width = atoi(argv[5]);
     height = atoi(argv[6]);
 
+    if (!g_thread_supported ())
+      g_thread_init (NULL);
     g_type_init();
 
     gnome_vfs_init();