dia r4212 - in trunk: . app lib

[hans svn gnome org]

Author: hans
Date: Tue Jan 20 23:28:51 2009
New Revision: 4212
URL: http://svn.gnome.org/viewvc/dia?rev=4212&view=rev

Log:
2009-01-20  Hans Breuer  <hans breuer org>

	* lib/persistence.c : use g_warning() instead of printf() for 
	pathological cases, also don't leak memory than; bug #564890.	

	* app/app_procs.c : cosmetical change when dumping pango version



Modified:
   trunk/ChangeLog
   trunk/app/app_procs.c
   trunk/lib/persistence.c

Modified: trunk/app/app_procs.c
==============================================================================
--- trunk/app/app_procs.c	(original)
+++ trunk/app/app_procs.c	Tue Jan 20 23:28:51 2009
@@ -482,7 +482,7 @@
            glib_major_version, glib_minor_version, glib_micro_version,
            GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
 #ifdef PANGO_VERSION_ENCODE
-  g_print ("pango   : %s (%d.%d.%d.)\n", pango_version_string(), PANGO_VERSION_MAJOR, PANGO_VERSION_MINOR, PANGO_VERSION_MICRO);
+  g_print ("pango   : %s (%d.%d.%d)\n", pango_version_string(), PANGO_VERSION_MAJOR, PANGO_VERSION_MINOR, PANGO_VERSION_MICRO);
 #else
   g_print ("pango   : version not available (>= 1.14.x)\n"); /* Pango did not provide such */
 #endif

Modified: trunk/lib/persistence.c
==============================================================================
--- trunk/lib/persistence.c	(original)
+++ trunk/lib/persistence.c	Tue Jan 20 23:28:51 2009
@@ -162,8 +162,10 @@
 
   if (g_hash_table_lookup(persistent_integers, role) == NULL) 
     g_hash_table_insert(persistent_integers, role, integer);
-  else 
-    printf("Int %s registered before loading persistence!\n", role);
+  else {
+    g_warning("Int %s registered before loading persistence!", role);
+    g_free(integer);
+  }
 }
 
 static void
@@ -182,8 +184,10 @@
 
   if (g_hash_table_lookup(persistent_reals, role) == NULL) 
     g_hash_table_insert(persistent_reals, role, realval);
-  else 
-    printf("Real %s registered before loading persistence!\n", role);
+  else {
+    g_warning("Real %s registered before loading persistence!", role);
+    g_free(realval);
+  }
 }
 
 static void
@@ -202,8 +206,10 @@
 
   if (g_hash_table_lookup(persistent_booleans, role) == NULL) 
     g_hash_table_insert(persistent_booleans, role, booleanval);
-  else 
-    printf("Boolean %s registered before loading persistence!\n", role);
+  else {
+    g_warning("Boolean %s registered before loading persistence!", role);
+    g_free(booleanval);
+  }
 }
 
 static void
@@ -221,8 +227,10 @@
 
   if (g_hash_table_lookup(persistent_strings, role) == NULL) 
     g_hash_table_insert(persistent_strings, role, stringval);
-  else 
-    printf("String %s registered before loading persistence!\n", role);
+  else {
+    g_warning("String %s registered before loading persistence!", role);
+    g_free(stringval);
+  }
 }
 
 static void
@@ -241,8 +249,10 @@
 
   if (g_hash_table_lookup(persistent_colors, role) == NULL) 
     g_hash_table_insert(persistent_colors, role, colorval);
-  else 
-    printf("Color %s registered before loading persistence!\n", role);
+  else {
+    g_warning("Color %s registered before loading persistence!", role);
+    g_free(colorval);
+  }
 }
 
 static xmlNodePtr
@@ -394,7 +404,8 @@
   for (items = ((PersistentList*)value)->glist; items != NULL;
        items = g_list_next(items)) {
     g_string_append(buf, (gchar *)items->data);
-    if (g_list_next(items) != NULL) g_string_append(buf, "\n");
+    if (g_list_next(items) != NULL) 
+      g_string_append(buf, "\n");
   }
   
   data_add_string(new_attribute(listnode, "listvalue"), buf->str);
@@ -524,7 +535,7 @@
 {
   const gchar *name = gtk_window_get_role(window);
   if (name == NULL) {
-    printf("Internal:  Window %s has no role.\n", gtk_window_get_title(window));
+    g_warning("Internal:  Window %s has no role.", gtk_window_get_title(window));
     return NULL;
   }
   return name;
@@ -851,8 +862,7 @@
 {
   PersistentList *plist = persistent_list_get(role);
   if(plist == NULL) {
-    printf("Can't find list for %s when adding %s\n", 
-	   role, item);
+    g_warning("Can't find list for %s when adding %s", role, item);
     return TRUE;
   }
   if (plist->sorted) {
@@ -989,12 +999,12 @@
 {
   gint *integer;
   if (persistent_integers == NULL) {
-    printf("No persistent integers to get for %s!\n", role);
+    g_warning("No persistent integers to get for %s!", role);
     return 0;
   }
   integer = (gint *)g_hash_table_lookup(persistent_integers, role);
   if (integer != NULL) return *integer;
-  printf("No integer to get for %s\n", role);
+  g_warning("No integer to get for %s", role);
   return 0;
 }
 
@@ -1003,12 +1013,14 @@
 {
   gint *integer;
   if (persistent_integers == NULL) {
-    printf("No persistent integers yet for %s!\n", role);
+    g_warning("No persistent integers yet for %s!", role);
     return;
   }
   integer = (gint *)g_hash_table_lookup(persistent_integers, role);
-  if (integer != NULL) *integer = newvalue;
-  else printf("No integer to set for %s\n", role);
+  if (integer != NULL) 
+    *integer = newvalue;
+  else 
+    g_warning("No integer to set for %s", role);
 }
 
 /* ********* REALS ********** */
@@ -1034,12 +1046,12 @@
 {
   real *realval;
   if (persistent_reals == NULL) {
-    printf("No persistent reals to get for %s!\n", role);
+    g_warning("No persistent reals to get for %s!", role);
     return 0;
   }
   realval = (real *)g_hash_table_lookup(persistent_reals, role);
   if (realval != NULL) return *realval;
-  printf("No real to get for %s\n", role);
+  g_warning("No real to get for %s", role);
   return 0.0;
 }
 
@@ -1048,12 +1060,14 @@
 {
   real *realval;
   if (persistent_reals == NULL) {
-    printf("No persistent reals yet for %s!\n", role);
+    g_warning("No persistent reals yet for %s!", role);
     return;
   }
   realval = (real *)g_hash_table_lookup(persistent_reals, role);
-  if (realval != NULL) *realval = newvalue;
-  else printf("No real to set for %s\n", role);
+  if (realval != NULL) 
+    *realval = newvalue;
+  else 
+    g_warning("No real to set for %s", role);
 }
 
 
@@ -1093,12 +1107,12 @@
 {
   gboolean *booleanval;
   if (persistent_booleans == NULL) {
-    printf("No persistent booleans to get for %s!\n", role);
+    g_warning("No persistent booleans to get for %s!", role);
     return FALSE;
   }
   booleanval = (gboolean *)g_hash_table_lookup(persistent_booleans, role);
   if (booleanval != NULL) return *booleanval;
-  printf("No boolean to get for %s\n", role);
+  g_warning("No boolean to get for %s", role);
   return FALSE;
 }
 
@@ -1107,12 +1121,14 @@
 {
   gboolean *booleanval;
   if (persistent_booleans == NULL) {
-    printf("No persistent booleans yet for %s!\n", role);
+    g_warning("No persistent booleans yet for %s!", role);
     return;
   }
   booleanval = (gboolean *)g_hash_table_lookup(persistent_booleans, role);
-  if (booleanval != NULL) *booleanval = newvalue;
-  else printf("No boolean to set for %s\n", role);
+  if (booleanval != NULL) 
+    *booleanval = newvalue;
+  else 
+    g_warning("No boolean to set for %s", role);
 }
 
 /* ********* STRINGS ********** */
@@ -1145,12 +1161,12 @@
 {
   gchar *stringval;
   if (persistent_strings == NULL) {
-    printf("No persistent strings to get for %s!\n", role);
+    g_warning("No persistent strings to get for %s!", role);
     return NULL;
   }
   stringval = (gchar *)g_hash_table_lookup(persistent_strings, role);
   if (stringval != NULL) return g_strdup(stringval);
-  printf("No string to get for %s\n", role);
+  g_warning("No string to get for %s", role);
   return NULL;
 }
 
@@ -1159,7 +1175,7 @@
 {
   gchar *stringval;
   if (persistent_strings == NULL) {
-    printf("No persistent strings yet for %s!\n", role);
+    g_warning("No persistent strings yet for %s!", role);
     return;
   }
   stringval = (gchar *)g_hash_table_lookup(persistent_strings, role);
@@ -1167,7 +1183,8 @@
     g_hash_table_insert(persistent_strings, role, g_strdup(newvalue));
     g_free(stringval);
   }
-  else printf("No string to set for %s\n", role);
+  else 
+    g_warning("No string to set for %s", role);
 }
 
 /* ********* COLORS ********** */
@@ -1195,12 +1212,12 @@
 {
   Color *colorval;
   if (persistent_colors == NULL) {
-    printf("No persistent colors to get for %s!\n", role);
+    g_warning("No persistent colors to get for %s!", role);
     return 0;
   }
   colorval = (Color *)g_hash_table_lookup(persistent_colors, role);
   if (colorval != NULL) return colorval;
-  printf("No color to get for %s\n", role);
+  g_warning("No color to get for %s", role);
   return 0;
 }
 
@@ -1209,10 +1226,12 @@
 {
   Color *colorval;
   if (persistent_colors == NULL) {
-    printf("No persistent colors yet for %s!\n", role);
+    g_warning("No persistent colors yet for %s!", role);
     return;
   }
   colorval = (Color *)g_hash_table_lookup(persistent_colors, role);
-  if (colorval != NULL) *colorval = *newvalue;
-  else printf("No color to set for %s\n", role);
+  if (colorval != NULL) 
+    *colorval = *newvalue;
+  else 
+    g_warning("No color to set for %s", role);
 }