[maemo-commits] [maemo-commits] r10256 - in projects/haf/branches/hildon-libs/hildon-1: . src

[From: subversion at stage.maemo.org]

Author: mdk
Date: 2007-02-28 16:12:05 +0200 (Wed, 28 Feb 2007)
New Revision: 10256

Modified:
   projects/haf/branches/hildon-libs/hildon-1/ChangeLog.2
   projects/haf/branches/hildon-libs/hildon-1/src/hildon-window.c
Log:
When the window name is empty, don't put extra dash there. Fixes NB#47989.


Modified: projects/haf/branches/hildon-libs/hildon-1/ChangeLog.2
===================================================================
--- projects/haf/branches/hildon-libs/hildon-1/ChangeLog.2	2007-02-28 13:01:27 UTC (rev 10255)
+++ projects/haf/branches/hildon-libs/hildon-1/ChangeLog.2	2007-02-28 14:12:05 UTC (rev 10256)
@@ -1,5 +1,10 @@
 2007-02-28  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
 
+	* src/hildon-window.c: When the window name is empty, don't put
+	extra dash there. Fixes NB#47989.
+
+2007-02-28  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
+
 	* examples/Makefile.am:
 	* examples/hildon-color-button-example.c:
 	* examples/hildon-number-editor-example.c: Adding number editor

Modified: projects/haf/branches/hildon-libs/hildon-1/src/hildon-window.c
===================================================================
--- projects/haf/branches/hildon-libs/hildon-1/src/hildon-window.c	2007-02-28 13:01:27 UTC (rev 10255)
+++ projects/haf/branches/hildon-libs/hildon-1/src/hildon-window.c	2007-02-28 14:12:05 UTC (rev 10256)
@@ -1478,13 +1478,16 @@
     {
         const gchar *old_title = gtk_window_get_title (GTK_WINDOW (window));
 
-        if (old_title && old_title[0])
+        if (old_title)
         {
             gchar *title = NULL;
+                
+            if (strlen (old_title) == 0) 
+                title = g_strdup (application_name);
+            else
+                title = g_strjoin (TITLE_SEPARATOR, application_name,
+                                   old_title, NULL);
 
-            title = g_strjoin (TITLE_SEPARATOR, application_name,
-                    old_title, NULL);
-
             gdk_window_set_title (GTK_WIDGET (window)->window, title);
 
             g_free (title);