Drop Hildon code from katze

1 files changed, 8 insertions, 63 deletions

diff --git a/katze/katze-utils.c b/katze/katze-utils.c
index adfdf484..8942162c 100644
--- a/katze/katze-utils.c
+++ b/katze/katze-utils.c
@@ -29,10 +29,6 @@
     #include <unistd.h>
 #endif
 
-#ifdef HAVE_HILDON_2_2
-    #include <hildon/hildon.h>
-#endif
-
 #define I_ g_intern_static_string
 
 static void
@@ -42,12 +38,7 @@ proxy_toggle_button_toggled_cb (GtkToggleButton* button,
     gboolean toggled;
     const gchar* property;
 
-    #ifdef HAVE_HILDON_2_2
-    if (HILDON_IS_CHECK_BUTTON (button))
-        toggled = hildon_check_button_get_active (HILDON_CHECK_BUTTON (button));
-    #else
     toggled = gtk_toggle_button_get_active (button);
-    #endif
     property = g_object_get_data (G_OBJECT (button), "property");
     g_object_set (object, property, toggled, NULL);
 }
@@ -219,17 +210,6 @@ proxy_spin_button_changed_cb (GtkSpinButton* button,
     }
 }
 
-#ifdef HAVE_HILDON_2_2
-static void
-proxy_picker_button_changed_cb (HildonPickerButton* button,
-                                GObject*            object)
-{
-    gint value = hildon_picker_button_get_active (button);
-    const gchar* property = g_object_get_data (G_OBJECT (button), "property");
-    g_object_set (object, property, value, NULL);
-    /* FIXME: Implement custom-PROPERTY */
-}
-#else
 static void
 proxy_combo_box_changed_cb (GtkComboBox* button,
                             GObject*     object)
@@ -287,7 +267,6 @@ proxy_combo_box_changed_cb (GtkComboBox* button,
         }
     }
 }
-#endif
 
 static void
 proxy_object_notify_boolean_cb (GObject*    object,
@@ -456,23 +435,14 @@ katze_property_proxy (gpointer     object,
         gchar* notify_property;
         gboolean toggled = katze_object_get_boolean (object, property);
 
-        #ifdef HAVE_HILDON_2_2
-        if (_hint != I_("toggle"))
-        {
-            widget = hildon_check_button_new (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
-            gtk_button_set_label (GTK_BUTTON (widget), gettext (nick));
-            hildon_check_button_set_active (HILDON_CHECK_BUTTON (widget), toggled);
-        }
+
+        widget = gtk_check_button_new ();
+        if (_hint == I_("toggle"))
+            gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (widget), FALSE);
         else
-        #endif
-        {
-            widget = gtk_check_button_new ();
-            if (_hint == I_("toggle"))
-                gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (widget), FALSE);
-            else
-                gtk_button_set_label (GTK_BUTTON (widget), gettext (nick));
-            gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), toggled);
-        }
+            gtk_button_set_label (GTK_BUTTON (widget), gettext (nick));
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), toggled);
+
         g_signal_connect (widget, "toggled",
                           G_CALLBACK (proxy_toggle_button_toggled_cb), object);
         notify_property = g_strdup_printf ("notify::%s", property);
@@ -740,10 +710,7 @@ katze_property_proxy (gpointer     object,
         widget = gtk_spin_button_new_with_range (
             G_PARAM_SPEC_INT (pspec)->minimum,
             G_PARAM_SPEC_INT (pspec)->maximum, 1);
-        #if HAVE_HILDON
-        hildon_gtk_entry_set_input_mode (GTK_ENTRY (widget),
-                                         HILDON_GTK_INPUT_MODE_NUMERIC);
-        #endif
+
         /* Keep it narrow, 5 digits are usually fine */
         gtk_entry_set_width_chars (GTK_ENTRY (widget), 5);
         gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value);
@@ -761,39 +728,17 @@ katze_property_proxy (gpointer     object,
         if (hint && g_str_has_prefix (hint, "custom-"))
             custom = &hint[7];
 
-        #ifdef HAVE_HILDON_2_2
-        GtkWidget* selector;
-
-        widget = hildon_picker_button_new (
-            HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
-            HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
-        selector = hildon_touch_selector_new_text ();
-        hildon_button_set_title (HILDON_BUTTON (widget), gettext (nick));
-        hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (widget),
-                                           HILDON_TOUCH_SELECTOR (selector));
-        #else
         widget = gtk_combo_box_text_new ();
-        #endif
         for (i = 0; i < enum_class->n_values; i++)
         {
             const gchar* raw_label = gettext (enum_class->values[i].value_nick);
             gchar* label = katze_strip_mnemonics (raw_label);
-            #ifdef HAVE_HILDON_2_2
-            hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), label);
-            #else
             gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), label);
-            #endif
             g_free (label);
         }
-        #ifdef HAVE_HILDON_2_2
-        hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, value);
-        g_signal_connect (widget, "value-changed",
-                          G_CALLBACK (proxy_picker_button_changed_cb), object);
-        #else
         gtk_combo_box_set_active (GTK_COMBO_BOX (widget), value);
         g_signal_connect (widget, "changed",
                           G_CALLBACK (proxy_combo_box_changed_cb), object);
-        #endif
         if (custom)
         {
             gchar* custom_text = katze_object_get_string (object, custom);