[Tux4kids-commits] r1339 - branches/commonification/tux4kids-common/trunk/src

[Bolesław Kulbabiński]

Author: bolekk-guest
Date: 2009-08-03 15:00:00 +0000 (Mon, 03 Aug 2009)
New Revision: 1339

Modified:
   branches/commonification/tux4kids-common/trunk/src/t4k-menu.c
   branches/commonification/tux4kids-common/trunk/src/t4k-sdl.c
Log:
small fixes in t4k-common

Modified: branches/commonification/tux4kids-common/trunk/src/t4k-menu.c
===================================================================
--- branches/commonification/tux4kids-common/trunk/src/t4k-menu.c	2009-08-03 14:55:45 UTC (rev 1338)
+++ branches/commonification/tux4kids-common/trunk/src/t4k-menu.c	2009-08-03 15:00:00 UTC (rev 1339)
@@ -181,9 +181,10 @@
     {
       if(strcmp(attr_val, "RUN_MAIN_MENU") == 0)
         node->activity = RUN_MAIN_MENU;
-      for(i = 0; i < n_of_activities; i++)
-        if(strcmp(attr_val, activities[i]) == 0)
-          node->activity = i;
+      else
+        for(i = 0; i < n_of_activities; i++)
+          if(strcmp(attr_val, activities[i]) == 0)
+            node->activity = i;
     }
     else
       DEBUGMSG(debug_menu_parser, "read_attributes(): unknown attribute %s , omitting\n", attr_name);
@@ -412,7 +413,7 @@
             {
               if (inRect(menu->submenu[menu->first_entry + i]->button_rect, event.motion.x, event.motion.y))
               {
-                if(snd_hover)
+                if(old_loc != i && snd_hover)
                   PlaySound(snd_hover);
                 loc = i;
                 break;   /* from for loop */

Modified: branches/commonification/tux4kids-common/trunk/src/t4k-sdl.c
===================================================================
--- branches/commonification/tux4kids-common/trunk/src/t4k-sdl.c	2009-08-03 14:55:45 UTC (rev 1338)
+++ branches/commonification/tux4kids-common/trunk/src/t4k-sdl.c	2009-08-03 15:00:00 UTC (rev 1339)
@@ -698,7 +698,7 @@
 /*-- file-scope variables and local file prototypes for SDL_Pango-based code: */
 #ifdef HAVE_LIBSDL_PANGO
 #include "SDL_Pango.h"
-SDLPango_Context* context = NULL;
+static SDLPango_Context* context = NULL;
 static SDLPango_Matrix* SDL_Colour_to_SDLPango_Matrix(const SDL_Color* cl);
 static int Set_SDL_Pango_Font_Size(int size);