Package: galculator
Version: 1.2.5.2-1
Dear Sebastien,
please find attached the patch (it's already applied in Ubuntu) to fix
the compile problem with gdk_color_to_string.
The compile fails with newer gdk libs.
Regards,
\sh
diff -ruN galculator-1.2.5.2.orig/src/callbacks.c galculator-1.2.5.2/src/callbacks.c
--- galculator-1.2.5.2.orig/src/callbacks.c 2006-03-22 09:41:39.000000000 +0100
+++ galculator-1.2.5.2/src/callbacks.c 2007-09-04 20:22:13.864711385 +0200
@@ -739,35 +739,35 @@
{
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 = gdk_color_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 = gdk_color_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 = gdk_color_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 = gdk_color_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 = gdk_color_to_string(&color);
display_update_tags();
}
else fprintf (stderr, "[%s] Color Dialog (%s) not found. %s\n", PACKAGE,
diff -ruN galculator-1.2.5.2.orig/src/general_functions.c galculator-1.2.5.2/src/general_functions.c
--- galculator-1.2.5.2.orig/src/general_functions.c 2006-03-22 09:41:39.000000000 +0100
+++ galculator-1.2.5.2/src/general_functions.c 2007-09-04 20:21:49.363315045 +0200
@@ -311,15 +311,6 @@
if (entry) gtk_entry_set_text (entry, *string_var);
}
-/*
- * convert given GdkColor to a string so that gdk_color_parse gives the
- * same color again.
- */
-
-char *gdk_color_to_string (GdkColor color)
-{
- return g_strdup_printf ("#%04X%04X%04X", color.red, color.green, color.blue);
-}
/*
* "apply"
diff -ruN galculator-1.2.5.2.orig/src/general_functions.h galculator-1.2.5.2/src/general_functions.h
--- galculator-1.2.5.2.orig/src/general_functions.h 2006-03-22 09:41:39.000000000 +0100
+++ galculator-1.2.5.2/src/general_functions.h 2007-09-04 20:21:38.862716520 +0200
@@ -51,7 +51,6 @@
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);
void apply_preferences (s_preferences prefs);
