[maemo-commits] [maemo-commits] r12238 - in projects/haf/trunk/hildon-desktop: . src

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-06-11 20:09:55 +0300 (Mon, 11 Jun 2007)
New Revision: 12238

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hd-home-background-dialog.c
Log:

2007-06-11  Johan Bilien  <johan.bilien at nokia.com>

	* src/hd-home-background-dialog.c:
	- remove extension and .sketch from image name
	Fixes: NB#56712



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-11 17:05:55 UTC (rev 12237)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-11 17:09:55 UTC (rev 12238)
@@ -1,5 +1,11 @@
 2007-06-11  Johan Bilien  <johan.bilien at nokia.com>
 
+	* src/hd-home-background-dialog.c:
+	- remove extension and .sketch from image name
+	Fixes: NB#56712
+
+2007-06-11  Johan Bilien  <johan.bilien at nokia.com>
+
 	* src/hd-home-background.c:
 	- call the callback even when an error occurred, so it can be
 	handled

Modified: projects/haf/trunk/hildon-desktop/src/hd-home-background-dialog.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-home-background-dialog.c	2007-06-11 17:05:55 UTC (rev 12237)
+++ projects/haf/trunk/hildon-desktop/src/hd-home-background-dialog.c	2007-06-11 17:09:55 UTC (rev 12238)
@@ -168,13 +168,41 @@
 {
   gchar *tmp;
   gchar *imagename;
+  gchar *last_dot, *c;
 
   tmp = g_filename_from_uri (filename, NULL, NULL);
+  g_debug ("Got filename %s", tmp);
   if (!tmp)
     tmp = g_strdup (filename);
 
   imagename = g_filename_display_basename (tmp);
 
+  g_debug ("Got imagename %s", imagename);
+
+  c = imagename;
+  last_dot = NULL;
+
+  while (*c)
+    {
+      if (*c == '.')
+        {
+          last_dot = c;
+        }
+
+      c++;
+    }
+
+  if(last_dot)
+    *last_dot = '\0';
+
+  /* We need a special case for our wonderful sketch program */
+  if (g_str_has_suffix (imagename, ".sketch"))
+    {
+      tmp = imagename;
+      imagename = g_strndup (tmp, strlen (tmp) - 7);
+      g_free (tmp);
+    }
+
   return imagename;
 }