Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu.vizoso@collabora.co.uk>2010-08-17 16:55:59 (GMT)
committer Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>2010-08-18 18:08:32 (GMT)
commit57c1460efcb6a1876bb3711826d35c80e40d54a1 (patch)
tree52d9672fad3706a9d799a335bd4d8374c40e58fc
parent8b94edca052a5a13ac4910fababac076e0963bdd (diff)
Move to Gtk 3.0
-rw-r--r--src/sugar/Makefile.am6
-rw-r--r--src/sugar/sugar-marshal.list1
2 files changed, 4 insertions, 3 deletions
diff --git a/src/sugar/Makefile.am b/src/sugar/Makefile.am
index c27747f..dcbf4a8 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-2.0 -lgtk-x11-2.0
+libsugarext_la_LIBADD = -lSM -lICE -lasound -lglib-2.0 -lgdk-x11-3.0 -lgtk-x11-3.0
libsugarext_la_SOURCES = \
$(BUILT_SOURCES) \
@@ -71,8 +71,8 @@ INTROSPECTION_GIRS = SugarExt-1.0.gir
INTROSPECTION_SCANNER_ARGS = --strip-prefix=Sugar
SugarExt_1_0_gir_LIBS = libsugarext.la
SugarExt_1_0_gir_FILES = $(libsugarext_la_SOURCES)
-SugarExt_1_0_gir_INCLUDES = Gtk-2.0
-SugarExt_1_0_gir_PACKAGES = gtk+-2.0
+SugarExt_1_0_gir_INCLUDES = Gtk-3.0
+SugarExt_1_0_gir_PACKAGES = gtk+-3.0
girdir = $(INTROSPECTION_GIRDIR)
dist_gir_DATA = SugarExt-1.0.gir
typelibdir = $(INTROSPECTION_TYPELIBDIR)
diff --git a/src/sugar/sugar-marshal.list b/src/sugar/sugar-marshal.list
index cb5ec08..dd10457 100644
--- a/src/sugar/sugar-marshal.list
+++ b/src/sugar/sugar-marshal.list
@@ -1 +1,2 @@
+BOOLEAN:UINT,UINT,ULONG
BOOLEAN:UINT,UINT,UINT