gnome-games r8540 - trunk/aisleriot

[chpe svn gnome org]

Author: chpe
Date: Thu Jan  8 23:44:42 2009
New Revision: 8540
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8540&view=rev

Log:
Use the right action to get the theme info from when looking for the
current theme's action after loading the new theme failed.
Use games_card_theme_info_equal to compare theme infos, not pointer
equality.

Modified:
   trunk/aisleriot/window.c

Modified: trunk/aisleriot/window.c
==============================================================================
--- trunk/aisleriot/window.c	(original)
+++ trunk/aisleriot/window.c	Thu Jan  8 23:44:42 2009
@@ -1498,7 +1498,7 @@
     current_theme_info = games_card_theme_get_theme_info (priv->theme);
   }
 
-  if (new_theme_info == current_theme_info)
+  if (games_card_theme_info_equal (new_theme_info, current_theme_info))
     return;
 
   theme = games_card_themes_get_theme (priv->theme_manager, new_theme_info);
@@ -1521,8 +1521,8 @@
       if (theme_action == action)
         continue;
 
-      info = g_object_get_data (G_OBJECT (action), "theme-info");
-      if (info != current_theme_info)
+      info = g_object_get_data (G_OBJECT (theme_action), "theme-info");
+      if (!games_card_theme_info_equal (info, current_theme_info))
         continue;
 
       /* The check at the top will prevent an infinite loop */