Port to Gtk+ 3.0, had to comment out some chunks

6 files changed, 30 insertions, 14 deletions

diff --git a/configure.ac b/configure.ac
index 6c99cf0..8f389a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
 
 AM_PATH_PYTHON
 
-PKG_CHECK_MODULES(EXT, gtk+-2.0 sm ice alsa)
+PKG_CHECK_MODULES(EXT, gtk+-3.0 sm ice alsa)
 
 GOBJECT_INTROSPECTION_CHECK([0.6.7])
 
diff --git a/src/sugar/Makefile.am b/src/sugar/Makefile.am
index dcbf4a8..1ea5d34 100644
--- a/src/sugar/Makefile.am
+++ b/src/sugar/Makefile.am
@@ -17,7 +17,7 @@ libsugarext_la_CFLAGS = 		\
         $(WARN_CFLAGS)
 
 libsugarext_la_LDFLAGS = $(LDADD)
-libsugarext_la_LIBADD = -lSM -lICE -lasound -lglib-2.0 -lgdk-x11-3.0 -lgtk-x11-3.0
+libsugarext_la_LIBADD = $(EXT_LIBS) -lSM -lICE -lasound
 
 libsugarext_la_SOURCES =		\
 	$(BUILT_SOURCES)		\
@@ -68,11 +68,12 @@ sugar-marshal.h: sugar-marshal.list
 
 include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS = SugarExt-1.0.gir
-INTROSPECTION_SCANNER_ARGS = --strip-prefix=Sugar
+INTROSPECTION_SCANNER_ARGS = --identifier-prefix=Sugar --symbol-prefix=sugar
 SugarExt_1_0_gir_LIBS = libsugarext.la
 SugarExt_1_0_gir_FILES = $(libsugarext_la_SOURCES)
-SugarExt_1_0_gir_INCLUDES = Gtk-3.0
-SugarExt_1_0_gir_PACKAGES = gtk+-3.0
+SugarExt_1_0_gir_INCLUDES = Gtk-3.0 Gdk-3.0
+SugarExt_1_0_gir_PACKAGES = gtk+-3.0 gdk-3.0
+SugarExt_1_0_gir_EXPORT_PACKAGES = SugarExt-1.0
 girdir = $(INTROSPECTION_GIRDIR)
 dist_gir_DATA = SugarExt-1.0.gir
 typelibdir = $(INTROSPECTION_TYPELIBDIR)
diff --git a/src/sugar/eggaccelerators.c b/src/sugar/eggaccelerators.c
index 0487db0..313bfa0 100644
--- a/src/sugar/eggaccelerators.c
+++ b/src/sugar/eggaccelerators.c
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <gdk/gdkx.h>
 #include <gdk/gdkkeysyms.h>
+#include <gdk/gdkkeysyms-compat.h>
 
 enum
 {
@@ -353,7 +354,9 @@ egg_accelerator_parse_virtual (const gchar            *accelerator,
 		    }
 		}
 	    } else if (keycode != NULL)
-		*keycode = XKeysymToKeycode (GDK_DISPLAY(), keyval);
+		*keycode = XKeysymToKeycode (
+		        GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+		        keyval);
 
           accelerator += len;
           len -= len;
diff --git a/src/sugar/sugar-address-entry.c b/src/sugar/sugar-address-entry.c
index 0fb9756..39d28e2 100644
--- a/src/sugar/sugar-address-entry.c
+++ b/src/sugar/sugar-address-entry.c
@@ -45,6 +45,7 @@ G_DEFINE_TYPE(SugarAddressEntry, sugar_address_entry, GTK_TYPE_ENTRY)
 static GQuark quark_inner_border   = 0;
 static const GtkBorder default_inner_border = { 2, 2, 2, 2 };
 
+#if 0
 static void
 draw_insertion_cursor (GtkEntry      *entry,
 		       GdkRectangle  *cursor_location,
@@ -490,6 +491,7 @@ sugar_address_entry_expose(GtkWidget      *widget,
 
 	return FALSE;
 }
+#endif
 
 static void
 sugar_address_entry_set_property(GObject         *object,
@@ -503,8 +505,9 @@ sugar_address_entry_set_property(GObject         *object,
 	switch (prop_id) {
 		case PROP_PROGRESS:
 			address_entry->progress = g_value_get_double(value);
-			if (GTK_WIDGET_REALIZED(entry))
-				gdk_window_invalidate_rect(entry->text_area, NULL, FALSE);
+			if (gtk_widget_get_realized(GTK_WIDGET(entry)))
+				gdk_window_invalidate_rect(
+				        gtk_widget_get_window (entry), NULL, FALSE);
 		break;
 
 		default:
@@ -538,7 +541,7 @@ sugar_address_entry_class_init(SugarAddressEntryClass *klass)
 	GtkWidgetClass *widget_class = (GtkWidgetClass*)klass;
 	GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
 
-	widget_class->expose_event = sugar_address_entry_expose;
+	//widget_class->expose_event = sugar_address_entry_expose;
 
 	gobject_class->set_property = sugar_address_entry_set_property;
 	gobject_class->get_property = sugar_address_entry_get_property;
diff --git a/src/sugar/sugar-key-grabber.c b/src/sugar/sugar-key-grabber.c
index 8a00a80..92406de 100644
--- a/src/sugar/sugar-key-grabber.c
+++ b/src/sugar/sugar-key-grabber.c
@@ -18,7 +18,6 @@
  */
 
 #include <X11/X.h>
-#include <gdk/gdkscreen.h>
 #include <gdk/gdkx.h>
 #include <gdk/gdk.h>
 
@@ -161,11 +160,13 @@ static void
 grab_key_real (Key *key, GdkWindow *root, gboolean grab, int result)
 {
         if (grab)
-                XGrabKey (GDK_DISPLAY(), key->keycode, (result | key->state),
-                                GDK_WINDOW_XID (root), True, GrabModeAsync, GrabModeAsync);
+                XGrabKey (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+                          key->keycode, (result | key->state),
+                          GDK_WINDOW_XID (root), True, GrabModeAsync, GrabModeAsync);
         else
-                XUngrabKey(GDK_DISPLAY(), key->keycode, (result | key->state),
-                                GDK_WINDOW_XID (root));
+                XUngrabKey(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+                           key->keycode, (result | key->state),
+                           GDK_WINDOW_XID (root));
 }
 
 #define N_BITS 32
diff --git a/src/sugar/sugar-menu.c b/src/sugar/sugar-menu.c
index 74580fa..79a2ea2 100644
--- a/src/sugar/sugar-menu.c
+++ b/src/sugar/sugar-menu.c
@@ -30,25 +30,31 @@ G_DEFINE_TYPE(SugarMenu, sugar_menu, GTK_TYPE_MENU)
 void
 sugar_menu_set_active(SugarMenu *menu, gboolean active)
 {
+#if 0
     GTK_MENU_SHELL(menu)->active = active;
+#endif
 }
 
 void
 sugar_menu_embed(SugarMenu *menu, GtkContainer *parent)
 {
+#if 0
     menu->orig_toplevel = GTK_MENU(menu)->toplevel;
 
     GTK_MENU(menu)->toplevel = gtk_widget_get_toplevel(GTK_WIDGET(parent));
     gtk_widget_reparent(GTK_WIDGET(menu), GTK_WIDGET(parent));
+#endif
 }
 
 void
 sugar_menu_unembed(SugarMenu *menu)
 {
+#if 0
     if (menu->orig_toplevel) {
         GTK_MENU(menu)->toplevel = menu->orig_toplevel;
         gtk_widget_reparent(GTK_WIDGET(menu), GTK_WIDGET(menu->orig_toplevel));
     }
+#endif
 }
 
 static void
@@ -59,5 +65,7 @@ sugar_menu_class_init(SugarMenuClass *menu_class)
 static void
 sugar_menu_init(SugarMenu *menu)
 {
+#if 0
     menu->orig_toplevel = NULL;
+#endif
 }