From f3756ff85a32f4b2a0771d0ac3bd78a69535395f Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Fri, 3 Jun 2011 11:44:52 +0100
Subject: Use generic headers in preparation for GTK+ 3 transition

Fixed bugs:
  - https://launchpad.net/bugs/792263

(bzr r10252.1.1)
---
 src/ege-color-prof-tracker.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/ege-color-prof-tracker.cpp')

diff --git a/src/ege-color-prof-tracker.cpp b/src/ege-color-prof-tracker.cpp
index 900246595..a6fcaa126 100644
--- a/src/ege-color-prof-tracker.cpp
+++ b/src/ege-color-prof-tracker.cpp
@@ -41,9 +41,7 @@
 
 #include <string.h>
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkmarshal.h>
+#include <gtk/gtk.h>
 
 #ifdef GDK_WINDOWING_X11
 #include <X11/Xlib.h>
-- 
cgit v1.2.3


From 2402528197627887e374dd2a4269dfdeb19acc58 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Wed, 15 Jun 2011 01:13:10 +0100
Subject: Clean up deprecated GTK_WIDGET API

(bzr r10302.1.2)
---
 src/ege-color-prof-tracker.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ege-color-prof-tracker.cpp')

diff --git a/src/ege-color-prof-tracker.cpp b/src/ege-color-prof-tracker.cpp
index a6fcaa126..6aeb554f9 100644
--- a/src/ege-color-prof-tracker.cpp
+++ b/src/ege-color-prof-tracker.cpp
@@ -448,7 +448,7 @@ void target_hierarchy_changed_cb(GtkWidget* widget, GtkWidget* prev_top, gpointe
 {
     if ( !prev_top && gtk_widget_get_toplevel(widget) ) {
         GtkWidget* top = gtk_widget_get_toplevel(widget);
-        if ( GTK_WIDGET_TOPLEVEL(top) ) {
+        if ( gtk_widget_is_toplevel(top) ) {
             GtkWindow* win = GTK_WINDOW(top);
             g_signal_connect( G_OBJECT(win), "event-after", G_CALLBACK( event_after_cb ), user_data );
             g_object_weak_ref( G_OBJECT(win), window_finalized, user_data );
-- 
cgit v1.2.3