Blob Blame History Raw
diff -up galculator-1.2.5.2/src/general_functions.c.color galculator-1.2.5.2/src/general_functions.c
--- galculator-1.2.5.2/src/general_functions.c.color	2006-03-22 09:41:39.000000000 +0100
+++ galculator-1.2.5.2/src/general_functions.c	2007-08-13 10:19:24.000000000 +0200
@@ -316,7 +316,7 @@ void set_entry (GladeXML *xml, char *ent
  * same color again.
  */
 
-char *gdk_color_to_string (GdkColor color)
+char *gdkcolor_to_string (GdkColor color)
 {
 	return g_strdup_printf ("#%04X%04X%04X", color.red, color.green, color.blue);
 }
diff -up galculator-1.2.5.2/src/general_functions.h.color galculator-1.2.5.2/src/general_functions.h
--- galculator-1.2.5.2/src/general_functions.h.color	2006-03-22 09:41:39.000000000 +0100
+++ galculator-1.2.5.2/src/general_functions.h	2007-08-13 10:19:12.000000000 +0200
@@ -51,7 +51,7 @@ void set_button_color (GladeXML *xml, ch
 void set_stacksize (GladeXML *xml, char *name, void *stack_size);
 void set_entry (GladeXML *xml, char *entry_name, void *entry_text);
 
-char *gdk_color_to_string (GdkColor color);
+char *gdkcolor_to_string (GdkColor color);
 
 void apply_preferences (s_preferences prefs);
 
diff -up galculator-1.2.5.2/src/callbacks.c.color galculator-1.2.5.2/src/callbacks.c
--- galculator-1.2.5.2/src/callbacks.c.color	2006-03-22 09:41:39.000000000 +0100
+++ galculator-1.2.5.2/src/callbacks.c	2007-08-13 10:19:48.000000000 +0200
@@ -739,35 +739,35 @@ on_color_ok_button_clicked             (
 	{
 		da = glade_xml_get_widget (prefs_xml, "prefs_bkg_color");
 		if (prefs.bkg_color != NULL) g_free (prefs.bkg_color);
-		prefs.bkg_color = gdk_color_to_string(color);
+		prefs.bkg_color = gdkcolor_to_string(color);
 		display_set_bkg_color (prefs.bkg_color);
 	}
 	else if (strcmp (title, SELECT_RESULT_FONT_COLOR) == 0)
 	{
 		da = glade_xml_get_widget (prefs_xml, "prefs_result_color");
 		if (prefs.result_color != NULL) g_free (prefs.result_color);
-		prefs.result_color = gdk_color_to_string(color);
+		prefs.result_color = gdkcolor_to_string(color);
 		display_update_tags();
 	}
 	else if (strcmp (title, SELECT_STACK_COLOR) == 0)
 	{
 		da = glade_xml_get_widget (prefs_xml, "prefs_stack_color");
 		if (prefs.stack_color != NULL) g_free (prefs.stack_color);
-		prefs.stack_color = gdk_color_to_string(color);
+		prefs.stack_color = gdkcolor_to_string(color);
 		display_update_tags();
 	}
 	else if (strcmp (title, SELECT_ACT_MOD_COLOR) == 0)
 	{
 		da = glade_xml_get_widget (prefs_xml, "prefs_act_mod_color");
 		if (prefs.act_mod_color != NULL) g_free (prefs.act_mod_color);
-		prefs.act_mod_color = gdk_color_to_string(color);
+		prefs.act_mod_color = gdkcolor_to_string(color);
 		display_update_tags();
 	}
 	else if (strcmp (title, SELECT_INACT_MOD_COLOR) == 0)
 	{
 		da = glade_xml_get_widget (prefs_xml, "prefs_inact_mod_color");
 		if (prefs.inact_mod_color != NULL) g_free (prefs.inact_mod_color);
-		prefs.inact_mod_color = gdk_color_to_string(color);
+		prefs.inact_mod_color = gdkcolor_to_string(color);
 		display_update_tags();
 	}
 	else fprintf (stderr, "[%s] Color Dialog (%s) not found. %s\n", PACKAGE,