gnome-games r8430 - trunk/libgames-support

[chpe svn gnome org]

Author: chpe
Date: Tue Jan  6 18:18:28 2009
New Revision: 8430
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8430&view=rev

Log:
Use games_filename_to_display_name for the display name of the card
themes.

Modified:
   trunk/libgames-support/games-card-theme-fixed.c
   trunk/libgames-support/games-card-theme-kde.c
   trunk/libgames-support/games-card-theme-preimage.c
   trunk/libgames-support/games-card-theme-sliced.c
   trunk/libgames-support/games-card-theme-svg.c

Modified: trunk/libgames-support/games-card-theme-fixed.c
==============================================================================
--- trunk/libgames-support/games-card-theme-fixed.c	(original)
+++ trunk/libgames-support/games-card-theme-fixed.c	Tue Jan  6 18:18:28 2009
@@ -29,6 +29,7 @@
 #include "games-files.h"
 #include "games-preimage.h"
 #include "games-runtime.h"
+#include "games-string-utils.h"
 
 #include "games-card-theme.h"
 #include "games-card-theme-private.h"
@@ -319,14 +320,21 @@
                                              const char *path,
                                              const char *filename)
 {
+  GamesCardThemeInfo *info;
+  char *display_name;
+
   if (!g_str_has_suffix (filename, ".card-theme"))
     return NULL;
 
-  return _games_card_theme_info_new (G_OBJECT_CLASS_TYPE (klass),
+  display_name = games_filename_to_display_name (filename);
+  info = _games_card_theme_info_new (G_OBJECT_CLASS_TYPE (klass),
                                      path,
-                                     filename, /* FIXME */
-                                     filename, /* FIXME */
+                                     filename,
+                                     display_name,
                                      NULL, NULL);
+  g_free (display_name);
+
+  return info;
 }
 
 static void

Modified: trunk/libgames-support/games-card-theme-kde.c
==============================================================================
--- trunk/libgames-support/games-card-theme-kde.c	(original)
+++ trunk/libgames-support/games-card-theme-kde.c	Tue Jan  6 18:18:28 2009
@@ -29,6 +29,7 @@
 #include "games-preimage.h"
 #include "games-preimage-private.h"
 #include "games-runtime.h"
+#include "games-string-utils.h"
 
 #include "games-card-theme.h"
 #include "games-card-theme-private.h"
@@ -167,14 +168,21 @@
                                            const char *path,
                                            const char *filename)
 {
+  GamesCardThemeInfo *info;
+  char *display_name;
+
   if (!g_str_has_suffix (filename, ".svgz")) // FIXMEchpe 
     return NULL;
 
-  return _games_card_theme_info_new (G_OBJECT_CLASS_TYPE (klass),
+  display_name = games_filename_to_display_name (filename);
+  info = _games_card_theme_info_new (G_OBJECT_CLASS_TYPE (klass),
                                      path,
-                                     filename, /* FIXME */
-                                     filename, /* FIXME */
+                                     filename,
+                                     display_name,
                                      NULL, NULL);
+  g_free (display_name);
+
+  return info;
 }
 
 static void

Modified: trunk/libgames-support/games-card-theme-preimage.c
==============================================================================
--- trunk/libgames-support/games-card-theme-preimage.c	(original)
+++ trunk/libgames-support/games-card-theme-preimage.c	Tue Jan  6 18:18:28 2009
@@ -32,6 +32,7 @@
 
 #include "games-card-theme.h"
 #include "games-card-theme-private.h"
+#include "games-string-utils.h"
 
 #define N_ROWS ((double) 5.0)
 #define N_COLS ((double) 13.0)
@@ -263,14 +264,21 @@
                                                 const char *path,
                                                 const char *filename)
 {
+  GamesCardThemeInfo *info;
+  char *display_name;
+
   if (!g_str_has_suffix (filename, ".svg")) // FIXMEchpe .svgz
     return NULL;
 
-  return _games_card_theme_info_new (G_OBJECT_CLASS_TYPE (klass),
+  display_name = games_filename_to_display_name (filename);
+  info = _games_card_theme_info_new (G_OBJECT_CLASS_TYPE (klass),
                                      path,
-                                     filename, /* FIXME */
-                                     filename, /* FIXME */
+                                     filename,
+                                     display_name,
                                      NULL, NULL);
+  g_free (display_name);
+
+  return info;
 }
 
 // FIXMEchpe move this to derived classes

Modified: trunk/libgames-support/games-card-theme-sliced.c
==============================================================================
--- trunk/libgames-support/games-card-theme-sliced.c	(original)
+++ trunk/libgames-support/games-card-theme-sliced.c	Tue Jan  6 18:18:28 2009
@@ -28,6 +28,7 @@
 #include "games-files.h"
 #include "games-preimage.h"
 #include "games-runtime.h"
+#include "games-string-utils.h"
 
 #include "games-card-theme.h"
 #include "games-card-theme-private.h"

Modified: trunk/libgames-support/games-card-theme-svg.c
==============================================================================
--- trunk/libgames-support/games-card-theme-svg.c	(original)
+++ trunk/libgames-support/games-card-theme-svg.c	Tue Jan  6 18:18:28 2009
@@ -29,6 +29,7 @@
 #include "games-files.h"
 #include "games-preimage.h"
 #include "games-runtime.h"
+#include "games-string-utils.h"
 
 #include "games-card-theme.h"
 #include "games-card-theme-private.h"