--- orage-4.12.1.orig/panel-plugin/oc_config.c +++ orage-4.12.1/panel-plugin/oc_config.c @@ -66,18 +66,6 @@ static void oc_fg_color_changed(GtkWidge oc_fg_set(clock); } -static void oc_set_bg_toggled(GtkToggleButton *cb, Clock *clock) -{ - clock->bg_set = gtk_toggle_button_get_active(cb); - oc_bg_set(clock); -} - -static void oc_bg_color_changed(GtkWidget *widget, Clock *clock) -{ - gtk_color_button_get_color((GtkColorButton *)widget, &clock->bg); - oc_bg_set(clock); -} - static void oc_set_height_toggled(GtkToggleButton *cb, Clock *clock) { clock->height_set = gtk_toggle_button_get_active(cb); @@ -233,7 +221,7 @@ static void oc_table_add(GtkWidget *tabl static void oc_properties_appearance(GtkWidget *dlg, Clock *clock) { GtkWidget *frame, *cb, *color, *sb; - GdkColor def_fg, def_bg; + GdkColor def_fg; GtkStyle *def_style; GtkWidget *table; char *clock_rotation_array[3] = {_("No rotation"), _("Rotate left") @@ -251,7 +239,6 @@ static void oc_properties_appearance(Gtk def_style = gtk_widget_get_default_style(); def_fg = def_style->fg[GTK_STATE_NORMAL]; - def_bg = def_style->bg[GTK_STATE_NORMAL]; /* show frame */ cb = gtk_check_button_new_with_mnemonic(_("Show _frame")); @@ -273,20 +260,6 @@ static void oc_properties_appearance(Gtk g_signal_connect(G_OBJECT(color), "color-set" , G_CALLBACK(oc_fg_color_changed), clock); - /* background color */ - cb = gtk_check_button_new_with_mnemonic(_("set _background color:")); - oc_table_add(table, cb, 2, 1); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cb), clock->bg_set); - g_signal_connect(cb, "toggled", G_CALLBACK(oc_set_bg_toggled), clock); - - if (!clock->bg_set) { - clock->bg = def_bg; - } - color = gtk_color_button_new_with_color(&clock->bg); - oc_table_add(table, color, 3, 1); - g_signal_connect(G_OBJECT(color), "color-set" - , G_CALLBACK(oc_bg_color_changed), clock); - /* clock size (=mbox size): height and width */ cb = gtk_check_button_new_with_mnemonic(_("set _height:")); oc_table_add(table, cb, 0, 2); --- orage-4.12.1.orig/panel-plugin/xfce4-orageclock-plugin.c +++ orage-4.12.1/panel-plugin/xfce4-orageclock-plugin.c @@ -527,11 +527,6 @@ static void oc_read_rc_file(XfcePanelPlu if (clock->fg_set) { clock->fg = oc_rc_read_color(rc, "fg", "black"); } - - clock->bg_set = xfce_rc_read_bool_entry(rc, "bg_set", FALSE); - if (clock->bg_set) { - clock->bg = oc_rc_read_color(rc, "bg", "white"); - } g_free(file); ret = xfce_rc_read_entry(rc, "timezone", NULL); @@ -602,16 +597,6 @@ void oc_write_rc_file(XfcePanelPlugin *p xfce_rc_delete_entry(rc, "fg", TRUE); } - xfce_rc_write_bool_entry(rc, "bg_set", clock->bg_set); - if (clock->bg_set) { - sprintf(tmp, "%uR %uG %uB" - , clock->bg.red, clock->bg.green, clock->bg.blue); - xfce_rc_write_entry(rc, "bg", tmp); - } - else { - xfce_rc_delete_entry(rc, "bg", TRUE); - } - xfce_rc_write_entry(rc, "timezone", clock->timezone->str); xfce_rc_write_bool_entry(rc, "width_set", clock->width_set); @@ -676,7 +661,6 @@ Clock *orage_oc_new(XfcePanelPlugin *plu clock->show_frame = TRUE; clock->fg_set = FALSE; - clock->bg_set = FALSE; clock->width_set = FALSE; clock->height_set = FALSE; clock->lines_vertically = TRUE; @@ -731,16 +715,6 @@ void oc_fg_set(Clock *clock) } } -void oc_bg_set(Clock *clock) -{ - GdkColor *bg = NULL; - - if (clock->bg_set) - bg = &clock->bg; - - gtk_widget_modify_bg(clock->ebox, GTK_STATE_NORMAL, bg); -} - void oc_timezone_set(Clock *clock) { if ((clock->timezone->str != NULL) && (clock->timezone->len > 0)) { @@ -781,7 +755,6 @@ static void oc_construct(XfcePanelPlugin oc_set_lines_to_panel(clock); oc_show_frame_set(clock); oc_fg_set(clock); - oc_bg_set(clock); oc_timezone_set(clock); oc_size_set(clock); --- orage-4.12.1.orig/panel-plugin/xfce4-orageclock-plugin.h +++ orage-4.12.1/panel-plugin/xfce4-orageclock-plugin.h @@ -34,8 +34,6 @@ typedef struct _clock gboolean show_frame; gboolean fg_set; GdkColor fg; - gboolean bg_set; - GdkColor bg; gboolean width_set; gint width; gboolean height_set; @@ -71,7 +69,6 @@ void oc_properties_dialog(XfcePanelPlugi void oc_show_frame_set(Clock *clock); void oc_fg_set(Clock *clock); -void oc_bg_set(Clock *clock); void oc_size_set(Clock *clock); void oc_timezone_set(Clock *clock); void oc_line_font_set(ClockLine *line);