DeforaOS/Browser
DeforaOS/Browser
2
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Use less deprecated code with Gtk+ >= 3.4

Browse Source
This commit is contained in:
Pierre Pronchery 2013-12-25 20:19:03 +01:00
parent e4213b617a
commit dad13ff188
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/desktop.c
View File

@ -2402,7 +2402,6 @@ static void _preferences_set(Desktop * desktop)
String const * p; String const * p;
String * q; String * q;
String const * filename = NULL; String const * filename = NULL;
GdkColor color = { 0, 0, 0, 0 };
const char black[] = "#000000000000"; const char black[] = "#000000000000";
const char white[] = "#ffffffffffff"; const char white[] = "#ffffffffffff";
int how; int how;
@ -2492,12 +2491,21 @@ static void _preferences_set_color(Config * config, char const * section,
GtkWidget * widget) GtkWidget * widget)
{ {
char const * p; char const * p;
#if GTK_CHECK_VERSION(3, 4, 0)
GdkRGBA color = { 0.0, 0.0, 0.0, 0.0 };
#else
GdkColor color = { 0, 0, 0, 0 }; GdkColor color = { 0, 0, 0, 0 };
#endif
if((p = config_get(config, section, variable)) == NULL) if((p = config_get(config, section, variable)) == NULL)
p = fallback; p = fallback;
#if GTK_CHECK_VERSION(3, 4, 0)
if(p != NULL && gdk_rgba_parse(&color, p) == TRUE)
gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(widget), &color);
#else
if(p != NULL && gdk_color_parse(p, &color) == TRUE) if(p != NULL && gdk_color_parse(p, &color) == TRUE)
gtk_color_button_set_color(GTK_COLOR_BUTTON(widget), &color); gtk_color_button_set_color(GTK_COLOR_BUTTON(widget), &color);
#endif
} }