[gnome-pilot] Fix for Ubuntu bug #569601. Looks like a badly named global variable was getting clobbered by someth



commit 8623d5c8e006bed922341f68b6f7eefac8e6a344
Author: Matt Davey <mcdavey mrao cam ac uk>
Date:   Wed Aug 18 22:41:10 2010 +0100

    Fix for Ubuntu bug #569601.
    Looks like a badly named global variable was getting clobbered by something.
    I wasn't able to reproduce this myself, so I don't know where the clash
    came from, but not a good idea to have a global variable called "initialized"!

 gpilotd/gnome-pilot-conduit-management.gob |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gpilotd/gnome-pilot-conduit-management.gob b/gpilotd/gnome-pilot-conduit-management.gob
index 2eab7a0..cb397c1 100644
--- a/gpilotd/gnome-pilot-conduit-management.gob
+++ b/gpilotd/gnome-pilot-conduit-management.gob
@@ -108,13 +108,13 @@ struct _GnomePilotConduitMgmtData {
   /* the version that the conduit xml spec files should have */
 #define CONDUIT_XML_VERSION "1.0"
 
-gboolean initialized = FALSE;
+gboolean gpcm_initialized = FALSE;
 int number_of_instances  = 0;
 GHashTable *conduitname_to_datastruct; 
 GHashTable *conduitid_to_datastruct; 
 
 /* these are the list of valid tags in addition to conduit-attribute */
-static const gchar *valid_tags[] = {"conduit","name",NULL};
+static const gchar *gpcm_valid_tags[] = {"conduit","name",NULL};
 %}
 
 class Gnome:Pilot:Conduit:Management from Gtk:Object {
@@ -142,7 +142,7 @@ class Gnome:Pilot:Conduit:Management from Gtk:Object {
 	/* This reads the .conduit files and loads the hashes */
 	private void 
 	initializer (void) {
-		if (!initialized) {
+		if (!gpcm_initialized) {
 			GList *conduit_files;
 			GList *iterator;
 
@@ -165,7 +165,7 @@ class Gnome:Pilot:Conduit:Management from Gtk:Object {
 			g_list_foreach (conduit_files, (GFunc)g_free, NULL);
 			g_list_free (conduit_files);
 		}
-		initialized = TRUE;
+		gpcm_initialized = TRUE;
 	}
 
 	/* This loads a conduit of a specific type. The _name argument is either 
@@ -324,8 +324,8 @@ class Gnome:Pilot:Conduit:Management from Gtk:Object {
 	private gboolean 
 	is_other_valid_tag (const gchar *s) {
 		gint i = 0;
-		for (i=0;valid_tags[i];i++)
-			if (g_ascii_strcasecmp (s,valid_tags[i]) == 0) return TRUE;
+		for (i=0;gpcm_valid_tags[i];i++)
+			if (g_ascii_strcasecmp (s,gpcm_valid_tags[i]) == 0) return TRUE;
 		return FALSE;
 		
 	}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]