r2045 - packages/trunk/teg/debian/patches

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2006-12-07 23:20:52 +0100 (Thu, 07 Dec 2006)
New Revision: 2045

Removed:
   packages/trunk/teg/debian/patches/20_avoid_invalid_theme.patch
Log:
b0rken patch. I've to rewrite it.


Deleted: packages/trunk/teg/debian/patches/20_avoid_invalid_theme.patch
===================================================================
--- packages/trunk/teg/debian/patches/20_avoid_invalid_theme.patch	2006-12-07 22:17:19 UTC (rev 2044)
+++ packages/trunk/teg/debian/patches/20_avoid_invalid_theme.patch	2006-12-07 22:20:52 UTC (rev 2045)
@@ -1,44 +0,0 @@
-diff -ru teg-0.11.1.orig/client/gui-gnome/gui.c teg-0.11.1/client/gui-gnome/gui.c
---- teg-0.11.1.orig/client/gui-gnome/gui.c	2002-10-14 23:04:36.000000000 +0200
-+++ teg-0.11.1/client/gui-gnome/gui.c	2006-07-16 23:33:51.000000000 +0200
-@@ -49,7 +49,7 @@
- #include "g_scores.h"
- #include "locate_country.h"
- 
--
-+#include "../themes.h"
- struct _gui_private gui_private;
- 
- TTheme	gui_theme;
-@@ -274,12 +274,25 @@
- 	gui_private.status_show =  gconf_client_get_int( g_conf_client, "/apps/teg/status_show",NULL);
- 	gui_private.dialog_show =  gconf_client_get_int( g_conf_client, "/apps/teg/dialog_show",NULL);
- 	string = gconf_client_get_string( g_conf_client, "/apps/teg/theme",NULL);
--	if( string )
--		strncpy( g_game.theme, string ,sizeof(g_game.theme) );
--	else
--		strncpy( g_game.theme, "m2" ,sizeof(g_game.theme) );
--	g_game.robot_in_server = gconf_client_get_bool( g_conf_client, "/apps/teg/robot_in_server",NULL);
--	
-+
-+  int theme_exists = 0;
-+  if( string ) {
-+    pTInfo pInext, g_tinfo;
-+    theme_enum_themes(g_tinfo);
-+
-+    for(pInext=g_tinfo;pInext;pInext = pInext->next ) {
-+      if( strncmp(pInext->name,string,strlen(pInext->name)) == 0 ) {
-+        theme_exists = 1;
-+        break;
-+        }
-+      }
-+  }
-+  if (theme_exists)
-+    strncpy( g_game.theme, string ,sizeof(g_game.theme) );
-+  else
-+    strncpy( g_game.theme, "m2" ,sizeof(g_game.theme) );
-+  g_game.robot_in_server = gconf_client_get_bool( g_conf_client, "/apps/teg/robot_in_server",NULL);
-+
- 	gconf_client_set_int   ( g_conf_client, "/apps/teg/port",  g_game.serport, NULL);
- 	gconf_client_set_string( g_conf_client, "/apps/teg/servername",g_game.sername, NULL);
- 	gconf_client_set_string( g_conf_client, "/apps/teg/playername",g_game.myname, NULL);