Improve r35695/35696 by repeating the whole function call in each
authorsfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 29 Jan 2011 07:47:03 +0000 (07:47 +0000)
committersfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 29 Jan 2011 07:47:03 +0000 (07:47 +0000)
block of the #if / #else / #endif for clarity.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35697 f5534014-38df-0310-8fa8-9805f1628bb7

gtk/color_edit_dlg.c

index dd8bf23411a201e6268c348f1d32cdb0725da368..49f106ba89a5df8e498cea267af3b435d0ea9f17 100644 (file)
@@ -468,13 +468,11 @@ color_sel_win_new(color_filter_t *colorf, gboolean is_bg)
 
   if (color != NULL) {
     color_t_to_gdkcolor(&gcolor, color);
-    gtk_color_selection_set_current_color(
 #if GTK_CHECK_VERSION(2,14,0)
-      GTK_COLOR_SELECTION(gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(color_sel_win))),
+    gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(color_sel_win))), &gcolor);
 #else
-      GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(color_sel_win)->colorsel),
+    gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(color_sel_win)->colorsel), &gcolor);
 #endif
-      &gcolor);
   }
 
   color_sel_ok = GTK_COLOR_SELECTION_DIALOG (color_sel_win)->ok_button;