[gimp] Build with GSEAL_ENABLE and #undef it where accessors are missing



commit fa21f2da5b0fba2e62359681de84f1c3d768e9e3
Author: Michael Natterer <mitch gimp org>
Date:   Sat Oct 17 19:03:24 2009 +0200

    Build with GSEAL_ENABLE and #undef it where accessors are missing

 app/dialogs/about-dialog.c                |   15 +++++++++------
 app/dialogs/dialogs.c                     |    2 +-
 app/dialogs/file-open-location-dialog.c   |    3 ++-
 app/dialogs/palette-import-dialog.c       |    2 +-
 app/dialogs/preferences-dialog.c          |    2 ++
 app/dialogs/resolution-calibrate-dialog.c |    2 ++
 6 files changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/app/dialogs/about-dialog.c b/app/dialogs/about-dialog.c
index 4459058..92c0082 100644
--- a/app/dialogs/about-dialog.c
+++ b/app/dialogs/about-dialog.c
@@ -262,20 +262,23 @@ about_dialog_anim_expose (GtkWidget       *widget,
                           GdkEventExpose  *event,
                           GimpAboutDialog *dialog)
 {
-  GtkStyle *style = gtk_widget_get_style (widget);
-  GdkGC    *text_gc;
-  gint      x, y;
-  gint      width, height;
+  GtkStyle      *style = gtk_widget_get_style (widget);
+  GtkAllocation  allocation;
+  GdkGC         *text_gc;
+  gint           x, y;
+  gint           width, height;
 
   if (! dialog->visible)
     return FALSE;
 
+  gtk_widget_get_allocation (widget, &allocation);
+
   text_gc = style->text_gc[GTK_STATE_NORMAL];
 
   pango_layout_get_pixel_size (dialog->layout, &width, &height);
 
-  x = (widget->allocation.width - width) / 2;
-  y = (widget->allocation.height - height) / 2;
+  x = (allocation.width  - width)  / 2;
+  y = (allocation.height - height) / 2;
 
   if (dialog->textrange[1] > 0)
     {
diff --git a/app/dialogs/dialogs.c b/app/dialogs/dialogs.c
index 8a9670e..99524c4 100644
--- a/app/dialogs/dialogs.c
+++ b/app/dialogs/dialogs.c
@@ -431,7 +431,7 @@ dialogs_get_toolbox (void)
        list;
        list = g_list_next (list))
     {
-      if (GTK_WIDGET_TOPLEVEL (list->data))
+      if (gtk_widget_is_toplevel (list->data))
         return list->data;
     }
 
diff --git a/app/dialogs/file-open-location-dialog.c b/app/dialogs/file-open-location-dialog.c
index b3e39d8..ca18096 100644
--- a/app/dialogs/file-open-location-dialog.c
+++ b/app/dialogs/file-open-location-dialog.c
@@ -190,7 +190,8 @@ file_open_location_response (GtkDialog *dialog,
 
       box = gimp_progress_box_new ();
       gtk_container_set_border_width (GTK_CONTAINER (box), 12);
-      gtk_box_pack_end (GTK_BOX (dialog->vbox), box, FALSE, FALSE, 0);
+      gtk_box_pack_end (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                        box, FALSE, FALSE, 0);
 
       g_object_set_data (G_OBJECT (dialog), "progress-box", box);
 
diff --git a/app/dialogs/palette-import-dialog.c b/app/dialogs/palette-import-dialog.c
index 88c0d09..132f745 100644
--- a/app/dialogs/palette-import-dialog.c
+++ b/app/dialogs/palette-import-dialog.c
@@ -734,7 +734,7 @@ palette_import_image_add (GimpContainer *container,
                           GimpImage     *image,
                           ImportDialog  *dialog)
 {
-  if (! GTK_WIDGET_IS_SENSITIVE (dialog->image_radio))
+  if (! gtk_widget_is_sensitive (dialog->image_radio))
     {
       gtk_widget_set_sensitive (dialog->image_radio, TRUE);
       gimp_context_set_image (dialog->context, image);
diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c
index 8e83e8a..07addc8 100644
--- a/app/dialogs/preferences-dialog.c
+++ b/app/dialogs/preferences-dialog.c
@@ -19,6 +19,8 @@
 
 #include <string.h>
 
+#undef GSEAL_ENABLE
+
 #include <gtk/gtk.h>
 
 #include "libgimpmath/gimpmath.h"
diff --git a/app/dialogs/resolution-calibrate-dialog.c b/app/dialogs/resolution-calibrate-dialog.c
index cbaf418..243a79e 100644
--- a/app/dialogs/resolution-calibrate-dialog.c
+++ b/app/dialogs/resolution-calibrate-dialog.c
@@ -17,6 +17,8 @@
 
 #include "config.h"
 
+#undef GSEAL_ENABLE
+
 #include <gtk/gtk.h>
 
 #include "libgimpmath/gimpmath.h"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]