[maemo-commits] [maemo-commits] r15108 - in projects/haf/trunk/hildon-desktop: . libhildondesktop libhildonwm src

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2008-01-22 17:52:39 +0200 (Tue, 22 Jan 2008)
New Revision: 15108

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/configure.ac
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-window.c
   projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c
   projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
Log:

2008-01-22  Johan Bilien  <johan.bilien at nokia.com>

	* configure.ac: check for individual functions from maemo-gtk rather
	than relying on MAEMO_CHANGES
	* libhildondesktop/hildon-desktop-panel-expandable.c,
	libhildondesktop/hildon-desktop-popup-window.c,
	libhildonwm/hd-wm.c: use these tests rather than MAEMO_CHANGES.
	Fixes: MB#2080
	Patch courtesy of Riku Voipio.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2008-01-21 07:26:59 UTC (rev 15107)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2008-01-22 15:52:39 UTC (rev 15108)
@@ -1,3 +1,13 @@
+2008-01-22  Johan Bilien  <johan.bilien at nokia.com>
+
+	* configure.ac: check for individual functions from maemo-gtk rather
+	than relying on MAEMO_CHANGES
+	* libhildondesktop/hildon-desktop-panel-expandable.c,
+	libhildondesktop/hildon-desktop-popup-window.c,
+	libhildonwm/hd-wm.c: use these tests rather than MAEMO_CHANGES.
+	Fixes: MB#2080
+	Patch courtesy of Riku Voipio.
+
 2008-01-09  Johan Bilien  <johan.bilien at nokia.com>
 
 	* configure.ac: 2.0.9

Modified: projects/haf/trunk/hildon-desktop/configure.ac
===================================================================
--- projects/haf/trunk/hildon-desktop/configure.ac	2008-01-21 07:26:59 UTC (rev 15107)
+++ projects/haf/trunk/hildon-desktop/configure.ac	2008-01-22 15:52:39 UTC (rev 15108)
@@ -218,6 +218,16 @@
 AC_SUBST(XTEST_CFLAGS)
 AC_DEFINE(HAVE_XTEST, [], [Whether XTest is present])
 
+save_CFLAGS="$CFLAGS"
+save_LIBS="$LIBS"
+CFLAGS=$HILDON_CFLAGS
+LIBS=$HILDON_LIBS
+AC_CHECK_DECLS([gdk_close_all_temporary_windows],[],[], [#include <gdk/gdk.h>])
+AC_CHECK_DECLS([gtk_window_set_is_temporary],[],[], [#include <gtk/gtk.h>])
+AC_CHECK_DECLS([gtk_window_close_other_temporaries],[],[], [#include <gtk/gtk.h>])
+CFLAGS="$save_CFLAGS"
+LIBS="$save_LIBS"
+
 #+++++++++++++++++++
 # Directories setup
 #+++++++++++++++++++

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c	2008-01-21 07:26:59 UTC (rev 15107)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c	2008-01-22 15:52:39 UTC (rev 15108)
@@ -366,7 +366,7 @@
   gtk_window_set_type_hint (panel->priv->extension_window,
 		  	    GDK_WINDOW_TYPE_HINT_DIALOG);
 
-#ifdef MAEMO_CHANGES
+#if HAVE_DECL_GTK_WINDOW_SET_IS_TEMPORARY
   gtk_window_set_is_temporary (panel->priv->extension_window, TRUE);
 #endif
   

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-window.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-window.c	2008-01-21 07:26:59 UTC (rev 15107)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-window.c	2008-01-22 15:52:39 UTC (rev 15108)
@@ -262,7 +262,9 @@
 #else
   GTK_WINDOW (popup)->type = GTK_WINDOW_TOPLEVEL;
 
+#if HAVE_DECL_GTK_WINDOW_SET_IS_TEMPORARY
   gtk_window_set_is_temporary (GTK_WINDOW (popup), TRUE);
+#endif
 
   gtk_window_set_decorated (GTK_WINDOW (popup), FALSE);
   gtk_widget_add_events (GTK_WIDGET (popup), GDK_VISIBILITY_NOTIFY_MASK);
@@ -292,7 +294,9 @@
 #else
     popup->priv->extra_panes[i] = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
+#if HAVE_DECL_GTK_WINDOW_SET_IS_TEMPORARY
     gtk_window_set_is_temporary (GTK_WINDOW (popup->priv->extra_panes[i]), TRUE);
+#endif
 
     gtk_window_set_decorated (GTK_WINDOW (popup->priv->extra_panes[i]), FALSE);
 

Modified: projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c	2008-01-21 07:26:59 UTC (rev 15107)
+++ projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c	2008-01-22 15:52:39 UTC (rev 15108)
@@ -763,7 +763,7 @@
   if (g_str_equal (HOME_LONG_PRESS, member) && !hd_wm_modal_windows_present())
   {
     g_signal_emit_by_name (hdwm, "long-key-press");
-#ifdef MAEMO_CHANGES    
+#if HAVE_DECL_GDK_CLOSE_ALL_TEMPORARY_WINDOWS
     gdk_close_all_temporary_windows ();
 #endif   
     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2008-01-21 07:26:59 UTC (rev 15107)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2008-01-22 15:52:39 UTC (rev 15108)
@@ -2360,7 +2360,7 @@
   }
   else if (GTK_WIDGET_VISIBLE (GTK_BIN (switcher->priv->toggle_button)->child))
   {
-#ifdef MAEMO_CHANGES	  
+#ifdef HAVE_DECL_GTK_WINDOW_CLOSE_OTHER_TEMPORARIES
     gtk_window_close_other_temporaries (GTK_WINDOW (switcher->priv->popup_window));
 #endif
     gtk_toggle_button_set_active