From 84a63033c820bf890e0bcecd2f07cc325c44e9e9 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Mon, 7 May 2012 17:18:10 -0700
Subject: require gtk3

---
 src/idomessagedialog.c | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'src/idomessagedialog.c')

diff --git a/src/idomessagedialog.c b/src/idomessagedialog.c
index d4a3e2f..d3f73aa 100644
--- a/src/idomessagedialog.c
+++ b/src/idomessagedialog.c
@@ -167,22 +167,14 @@ ido_message_dialog_focus_in_event (GtkWidget     *widget,
       IdoTimeline *timeline;
       IdoMessageDialogMorphContext *context;
 
-#ifdef USE_GTK3
       gtk_widget_get_preferred_size (GTK_WIDGET (dialog), NULL, &start);
-#else
-      gtk_widget_get_requisition (GTK_WIDGET (dialog), &start);
-#endif
 
       priv->expanded = TRUE;
 
       gtk_widget_show (priv->action_area);
       gtk_widget_show (priv->secondary_label);
 
-#ifdef USE_GTK3
       gtk_widget_get_preferred_size (GTK_WIDGET (dialog), NULL, &end);
-#else
-      gtk_widget_get_requisition (GTK_WIDGET (dialog), &end);
-#endif
 
       gtk_widget_hide (priv->action_area);
       gtk_widget_hide (priv->secondary_label);
@@ -379,11 +371,7 @@ ido_message_dialog_get_label (IdoMessageDialog *dialog, gboolean primary)
 
   for (list = children; list != NULL; list = list->next)
     {
-#ifdef USE_GTK3
       if (G_TYPE_FROM_INSTANCE (list->data) == GTK_TYPE_BOX && gtk_orientable_get_orientation (list->data) == GTK_ORIENTATION_HORIZONTAL)
-#else
-      if (G_TYPE_FROM_INSTANCE (list->data) == GTK_TYPE_HBOX)
-#endif
         {
 	  GList *hchildren;
           GList *hlist;
@@ -393,11 +381,7 @@ ido_message_dialog_get_label (IdoMessageDialog *dialog, gboolean primary)
 
           for (hlist = hchildren; hlist != NULL; hlist = hlist->next)
             {
-#ifdef USE_GTK3
               if (G_TYPE_FROM_INSTANCE (hlist->data) == GTK_TYPE_BOX && gtk_orientable_get_orientation (hlist->data) == GTK_ORIENTATION_VERTICAL)
-#else
-              if (G_TYPE_FROM_INSTANCE (hlist->data) == GTK_TYPE_VBOX)
-#endif
                 {
                   GList *vlist;
                   GtkWidget *vbox = GTK_WIDGET (hlist->data);
-- 
cgit v1.2.3


From 73302803e066d8d36e425feda15f57fca44f4bc5 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Wed, 22 Aug 2012 09:44:00 -0500
Subject: remove the gtk2 conditional compiles for IdoMessageDialog

---
 src/idomessagedialog.c | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'src/idomessagedialog.c')

diff --git a/src/idomessagedialog.c b/src/idomessagedialog.c
index d3f73aa..41ff2e7 100644
--- a/src/idomessagedialog.c
+++ b/src/idomessagedialog.c
@@ -281,14 +281,6 @@ ido_message_dialog_new (GtkWindow      *parent,
                          NULL);
   dialog = GTK_DIALOG (widget);
 
-#if ! GTK_CHECK_VERSION(3, 0, 0)
-  if (flags & GTK_DIALOG_NO_SEPARATOR)
-    {
-      g_warning ("The GTK_DIALOG_NO_SEPARATOR flag cannot be used for IdoMessageDialog");
-      flags &= ~GTK_DIALOG_NO_SEPARATOR;
-    }
-#endif
-
   if (message_format)
     {
       va_start (args, message_format);
-- 
cgit v1.2.3