rendered paste body--- liferea-1.5.15.orig/configure 2009-03-29 05:11:08.000000000 -0400+++ liferea-1.5.15/configure 2009-07-07 17:18:42.502143627 -0400@@ -1652,7 +1652,8 @@ --disable-nm compile without NetworkManager support --disable-libnotify don't compile the libnotify plugin --disable-lua don't compile with LUA scripting support- --disable-schemas-install Disable the schemas installation+ --disable-schemas-install+ Disable the schemas installation Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]@@ -4509,13 +4510,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext- (eval echo "\"\$as_me:4512: $ac_compile\"" >&5)+ (eval echo "\"\$as_me:4513: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5- (eval echo "\"\$as_me:4515: $NM \\\"conftest.$ac_objext\\\"\"" >&5)+ (eval echo "\"\$as_me:4516: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5- (eval echo "\"\$as_me:4518: output\"" >&5)+ (eval echo "\"\$as_me:4519: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin"@@ -5721,7 +5722,7 @@ ;; *-*-irix6*) # Find out which ABI we are using.- echo '#line 5724 "configure"' > conftest.$ac_ext+ echo '#line 5725 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$?@@ -7512,11 +7513,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'`- (eval echo "\"\$as_me:7515: $lt_compile\"" >&5)+ (eval echo "\"\$as_me:7516: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5- echo "$as_me:7519: \$? = $ac_status" >&5+ echo "$as_me:7520: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output.@@ -7851,11 +7852,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'`- (eval echo "\"\$as_me:7854: $lt_compile\"" >&5)+ (eval echo "\"\$as_me:7855: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5- echo "$as_me:7858: \$? = $ac_status" >&5+ echo "$as_me:7859: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output.@@ -7956,11 +7957,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'`- (eval echo "\"\$as_me:7959: $lt_compile\"" >&5)+ (eval echo "\"\$as_me:7960: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5- echo "$as_me:7963: \$? = $ac_status" >&5+ echo "$as_me:7964: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized@@ -8011,11 +8012,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'`- (eval echo "\"\$as_me:8014: $lt_compile\"" >&5)+ (eval echo "\"\$as_me:8015: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5- echo "$as_me:8018: \$? = $ac_status" >&5+ echo "$as_me:8019: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized@@ -8130,6 +8131,9 @@ openbsd*) with_gnu_ld=no ;;+ linux* | k*bsd*-gnu)+ link_all_deplibs=no+ ;; esac ld_shlibs=yes@@ -10824,7 +10828,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF-#line 10827 "configure"+#line 10831 "configure" #include "confdefs.h" #if HAVE_DLFCN_H@@ -10920,7 +10924,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF-#line 10923 "configure"+#line 10927 "configure" #include "confdefs.h" #if HAVE_DLFCN_H@@ -14543,7 +14547,8 @@ gmodule-2.0 >= 2.0.0 libglade-2.0 >= 2.0.0 libsoup-2.4 >= 2.26- webkit-1.0 >= 1.1.1"+ webkit-1.0 >= 1.1.1+ libwnck-1.0 >= 2.20" pkg_failed=no--- liferea-1.5.15.orig/configure.ac 2009-03-29 05:09:45.000000000 -0400+++ liferea-1.5.15/configure.ac 2009-07-07 17:18:42.481178531 -0400@@ -143,7 +143,8 @@ gmodule-2.0 >= 2.0.0 libglade-2.0 >= 2.0.0 libsoup-2.4 >= 2.26- webkit-1.0 >= 1.1.1"+ webkit-1.0 >= 1.1.1+ libwnck-1.0 >= 2.20" PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) --- liferea-1.5.15.orig/src/ui/liferea_shell.c 2009-03-27 17:18:57.000000000 -0400+++ liferea-1.5.15/src/ui/liferea_shell.c 2009-07-07 17:20:08.862174081 -0400@@ -27,10 +27,14 @@ #include <gtk/gtk.h> #include <gdk/gdk.h>+#include <gdk/gdkx.h> #include <gdk/gdkkeysyms.h> #include <glade/glade.h> #include <string.h> /* strcmp() and strsep() */ +#define WNCK_I_KNOW_THIS_IS_UNSTABLE+#include <libwnck/libwnck.h>+ #include "browser.h" #include "common.h" #include "conf.h"@@ -1329,14 +1333,27 @@ liferea_shell_toggle_visibility (void) { GtkWidget *mainwindow = GTK_WIDGET (shell->priv->window);+ GdkWindow *gdkwindow = gtk_widget_get_window(mainwindow);+ WnckWindow *wnckwindow = wnck_window_get(GDK_WINDOW_XID(gdkwindow));++ WnckWorkspace *activeworkspace = wnck_screen_get_active_workspace(+ wnck_screen_get_default());+ + if ((gdk_window_get_state (mainwindow->window) & GDK_WINDOW_STATE_ICONIFIED) ||- !GTK_WIDGET_VISIBLE (mainwindow)) {+ !GTK_WIDGET_VISIBLE (mainwindow)) { liferea_shell_restore_position (); gtk_window_present (shell->priv->window); } else {- liferea_shell_save_position ();- gtk_widget_hide (mainwindow);+ if(wnck_window_is_in_viewport(+ wnckwindow,activeworkspace) && gtk_window_is_active(shell->priv->window)) {+ liferea_shell_save_position ();+ gtk_widget_hide (mainwindow);+ } else {+ liferea_shell_restore_position();+ gtk_window_present(shell->priv->window);+ } } }