--- configure.ac- 2015-03-14 12:05:16.590068913 +0000 +++ configure.ac 2015-03-14 12:05:38.581332386 +0000 @@ -885,7 +885,7 @@ fi dnl ---------- GTK2 ------------------------------------------------------- if test "${enable_manager}" = yes ; then - PKG_CHECK_MODULES(GTK, [gtk+-2.0]) + PKG_CHECK_MODULES(GTK, [gtk+-3.0]) fi dnl ---------- Sqlite3 ---------------------------------------------------- --- m4/gtk-2.0.m4- 2015-03-14 12:06:05.434433049 +0000 +++ m4/gtk-2.0.m4 2015-03-14 12:06:24.783785033 +0000 @@ -12,7 +12,7 @@ dnl AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program], , enable_gtktest=yes) - pkg_config_args=gtk+-2.0 + pkg_config_args=gtk+-3.0 for module in . $4 do case "$module" in @@ -58,11 +58,11 @@ AC_ARG_ENABLE(gtktest, [ --disable-gtkt if test x"$no_gtk" = x ; then GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs` - gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ + gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-3.0 | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ + gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-3.0 | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ + gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-3.0 | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` if test "x$enable_gtktest" = "xyes" ; then ac_save_CFLAGS="$CFLAGS" @@ -98,7 +98,7 @@ main () (gtk_minor_version != $gtk_config_minor_version) || (gtk_micro_version != $gtk_config_micro_version)) { - printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", + printf("\n*** 'pkg-config --modversion gtk+-3.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, gtk_major_version, gtk_minor_version, gtk_micro_version); printf ("*** was found! If pkg-config was correct, then it is best\n"); --- clientgui/gtk/taskbarex.cpp- 2015-03-14 12:19:37.552244196 +0000 +++ clientgui/gtk/taskbarex.cpp 2015-03-14 12:19:47.919897213 +0000 @@ -208,7 +208,7 @@ bool wxTaskBarIconEx::SetIcon(const wxIc gtk_status_icon_set_from_pixbuf(g_pStatusIcon, bitmap.GetPixbuf()); if (!message.empty()) { - gtk_status_icon_set_tooltip(g_pStatusIcon, message.mb_str()); + gtk_status_icon_set_tooltip_text(g_pStatusIcon, message.mb_str()); } gtk_status_icon_set_visible(g_pStatusIcon, TRUE);