[Xfce4-commits] <xfce4-notes-plugin:master> gtk3: Drop the background color setting

[Mike Massonnet]

Updating branch refs/heads/master
         to 92e14fa7ea78da2e7e5dc578dcf3741321820037 (commit)
       from de7638f7600fda93f91c8608da2ba7971a2dd16c (commit)

commit 92e14fa7ea78da2e7e5dc578dcf3741321820037
Author: Mike Massonnet <mmassonnet at gmail.com>
Date:   Sat Mar 9 10:16:51 2013 +0100

    gtk3: Drop the background color setting
    
    Theming the notes window with GTK3 will need something different than
    gtkrc, and currently the background setting depends on a gtkrc file.

 src/main-settings-dialog.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/main-settings-dialog.c b/src/main-settings-dialog.c
index 271654e..6afb515 100644
--- a/src/main-settings-dialog.c
+++ b/src/main-settings-dialog.c
@@ -58,6 +58,7 @@ enum
 static GtkWidget *size_combo_box_new ();
 static void cb_size_combobox_changed (GtkComboBox *combobox, gpointer data);
 
+#ifndef ENABLE_GTK3
 enum
 {
   COMBOBOX_BACKGROUND_YELLOW,
@@ -83,11 +84,14 @@ static gboolean timeout_cb_background_changed (gchar *color);
 
 static GtkWidget *color_button_new ();
 static gboolean cb_color_button_pressed (GtkButton *button, GdkEventButton *event, gpointer data);
+#endif
 
 static GtkWidget *parent_window = NULL;
 static XfconfChannel *xfconf_channel = NULL;
+#ifndef ENABLE_GTK3
 static GtkWidget *color_combobox = NULL;
 static GtkWidget *color_button = NULL;
+#endif
 
 static GtkWidget *
 prop_dialog_new (void)
@@ -183,6 +187,7 @@ prop_dialog_new (void)
   button = tabs_combo_box_new ();
   gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
 
+#ifndef ENABLE_GTK3
   /* Background color */
 #ifdef ENABLE_GTK3
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, BORDER);
@@ -199,6 +204,7 @@ prop_dialog_new (void)
 
   color_button = color_button_new ();
   gtk_box_pack_start (GTK_BOX (hbox), color_button, FALSE, FALSE, 0);
+#endif
 
   /* Font description */
 #ifdef ENABLE_GTK3
@@ -406,6 +412,7 @@ cb_size_combobox_changed (GtkComboBox *combobox,
   xfconf_channel_set_int (xfconf_channel, "/new-window/height", height);
 }
 
+#ifndef ENABLE_GTK3
 static GtkWidget *
 background_combo_box_new (void)
 {
@@ -655,6 +662,7 @@ cb_color_button_pressed (GtkButton *button,
 
   return TRUE;
 }
+#endif