diff -up ethos-0.2.2/configure.ac.gtk3 ethos-0.2.2/configure.ac
--- ethos-0.2.2/configure.ac.gtk3 2011-05-03 15:27:10.225456980 -0400
+++ ethos-0.2.2/configure.ac 2011-05-03 15:27:10.231456906 -0400
@@ -73,7 +73,7 @@ PKG_CHECK_MODULES(ETHOS, gobject-2.0 >=
AC_SUBST(ETHOS_CFLAGS)
AC_SUBST(ETHOS_LIBS)
-PKG_CHECK_MODULES(ETHOS_UI, gtk+-2.0 >= gtk_req_version)
+PKG_CHECK_MODULES(ETHOS_UI, gtk+-3.0 >= gtk_req_version)
AC_SUBST(ETHOS_UI_CFLAGS)
AC_SUBST(ETHOS_UI_LIBS)
diff -up ethos-0.2.2/configure.gtk3 ethos-0.2.2/configure
--- ethos-0.2.2/configure.gtk3 2011-05-03 15:27:10.228456944 -0400
+++ ethos-0.2.2/configure 2011-05-03 15:27:10.234456868 -0400
@@ -12942,12 +12942,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_ETHOS_UI_CFLAGS="$ETHOS_UI_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.10\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.10") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 2.10\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 2.10") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_ETHOS_UI_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.10" 2>/dev/null`
+ pkg_cv_ETHOS_UI_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 2.10" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -12960,12 +12960,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_ETHOS_UI_LIBS="$ETHOS_UI_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.10\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.10") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 2.10\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 2.10") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_ETHOS_UI_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.10" 2>/dev/null`
+ pkg_cv_ETHOS_UI_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 2.10" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -12984,14 +12984,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- ETHOS_UI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= 2.10"`
+ ETHOS_UI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-3.0 >= 2.10"`
else
- ETHOS_UI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.10"`
+ ETHOS_UI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-3.0 >= 2.10"`
fi
# Put the nasty error message in config.log where it belongs
echo "$ETHOS_UI_PKG_ERRORS" >&5
- as_fn_error "Package requirements (gtk+-2.0 >= 2.10) were not met:
+ as_fn_error "Package requirements (gtk+-3.0 >= 2.10) were not met:
$ETHOS_UI_PKG_ERRORS
diff -up ethos-0.2.2/ethos/ethos-ui-manager-widget.c.gtk3 ethos-0.2.2/ethos/ethos-ui-manager-widget.c
--- ethos-0.2.2/ethos/ethos-ui-manager-widget.c.gtk3 2011-05-03 15:27:43.003054095 -0400
+++ ethos-0.2.2/ethos/ethos-ui-manager-widget.c 2011-05-03 15:28:42.653322574 -0400
@@ -320,7 +320,7 @@ show_error_dialog:
gtk_window_set_title (GTK_WINDOW (dialog), "");
gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+ /* gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); */
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
gtk_container_set_border_width (GTK_CONTAINER (content_area), 12);
@@ -561,10 +561,6 @@ ethos_ui_manager_widget_init (EthosUIMan
manager_widget->priv->about = about;
manager_widget->priv->list_store = list_store;
- if (gtk_about_dialog_set_url_hook (url_hook_cb, NULL, NULL) != NULL) {
- g_warning ("Ethos overwrote a previous GtkAboutDialog url hook"
- ". This may cause a bug in your application.");
- }
}
/**
diff -up ethos-0.2.2/ethos-ui.pc.in.gtk3 ethos-0.2.2/ethos-ui.pc.in
--- ethos-0.2.2/ethos-ui.pc.in.gtk3 2009-11-07 22:39:13.000000000 -0500
+++ ethos-0.2.2/ethos-ui.pc.in 2011-05-03 15:27:10.234456868 -0400
@@ -8,4 +8,4 @@ Description: User interface widgets for
Version: @VERSION@
Libs: -L${libdir} -lethos-ui-1.0
Cflags: -I${includedir}/ethos-1.0
-Requires: ethos-1.0 gtk+-2.0
+Requires: ethos-1.0 gtk+-3.0
diff -up ethos-0.2.2/examples/vala/Makefile.am.gtk3 ethos-0.2.2/examples/vala/Makefile.am
--- ethos-0.2.2/examples/vala/Makefile.am.gtk3 2009-11-07 22:39:13.000000000 -0500
+++ ethos-0.2.2/examples/vala/Makefile.am 2011-05-03 15:27:10.234456868 -0400
@@ -13,7 +13,7 @@ basic_LDADD = \
basic_sources = basic.c
basic_headers = basic.h
basic.c basic.h: $(srcdir)/basic.vala
- valac -C $(srcdir)/basic.vala --vapidir $(top_srcdir)/bindings/vala --pkg ethos-1.0 --pkg gtk+-2.0
+ valac -C $(srcdir)/basic.vala --vapidir $(top_srcdir)/bindings/vala --pkg ethos-1.0 --pkg gtk+-3.0
endif
EXTRA_DIST = basic.vala
