[maemo-commits] [maemo-commits] r8299 - in projects/haf/trunk/maemo-af-desktop: . debian hildon-navigator

[From: www-data at stage.maemo.org]

Author: jobi
Date: 2006-11-24 10:47:30 +0200 (Fri, 24 Nov 2006)
New Revision: 8299

Modified:
   projects/haf/trunk/maemo-af-desktop/ChangeLog
   projects/haf/trunk/maemo-af-desktop/debian/control
   projects/haf/trunk/maemo-af-desktop/hildon-navigator/hn-app-switcher.c
   projects/haf/trunk/maemo-af-desktop/hildon-navigator/hn-others-button.c
Log:

2006-11-22  Johan Bilien <johan.bilien at nokia.com>

	* hildon-navigator/hn-app-switcher.c,
	  hildon-navigator/hn-others-button.c:
	  - enable extension events on the button widget
	  - use the hildon-finger commodity to detect finger press.
	Fixes: NB#47370



Modified: projects/haf/trunk/maemo-af-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/maemo-af-desktop/ChangeLog	2006-11-24 08:41:07 UTC (rev 8298)
+++ projects/haf/trunk/maemo-af-desktop/ChangeLog	2006-11-24 08:47:30 UTC (rev 8299)
@@ -1,3 +1,11 @@
+2006-11-22  Johan Bilien <johan.bilien at nokia.com>
+
+	* hildon-navigator/hn-app-switcher.c,
+	  hildon-navigator/hn-others-button.c:
+	  - enable extension events on the button widget
+	  - use the hildon-finger commodity to detect finger press.
+	Fixes: NB#47370
+
 2006-11-20  Johan Bilien <johan.bilien at nokia.com>
 
 	* hildon-navigator/plugins.conf: Removed (moved to

Modified: projects/haf/trunk/maemo-af-desktop/debian/control
===================================================================
--- projects/haf/trunk/maemo-af-desktop/debian/control	2006-11-24 08:41:07 UTC (rev 8298)
+++ projects/haf/trunk/maemo-af-desktop/debian/control	2006-11-24 08:47:30 UTC (rev 8299)
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: Johan Bilien <johan.bilien at nokia.com>
-Build-Depends: debhelper (>= 4.0.0), hildon-libs-dev (>= 0.12.2), pkg-config, libosso-dev (>= 0.9.19), libosso-gnomevfs2-dev, osso-af-settings, hildon-base-lib-dev (>= 0.9.3), shared-mime-info, hildon-fm-dev (>= 0.15), libosso-help-dev, libxtst-dev, libxml2-dev, osso-esd-dev
+Build-Depends: debhelper (>= 4.0.0), hildon-libs-dev (>= 0.14.9), pkg-config, libosso-dev (>= 0.9.19), libosso-gnomevfs2-dev, osso-af-settings, hildon-base-lib-dev (>= 0.9.3), shared-mime-info, hildon-fm-dev (>= 0.15), libosso-help-dev, libxtst-dev, libxml2-dev, osso-esd-dev
 Standards-Version: 3.6.0
  
 Package: maemo-af-desktop

Modified: projects/haf/trunk/maemo-af-desktop/hildon-navigator/hn-app-switcher.c
===================================================================
--- projects/haf/trunk/maemo-af-desktop/hildon-navigator/hn-app-switcher.c	2006-11-24 08:41:07 UTC (rev 8298)
+++ projects/haf/trunk/maemo-af-desktop/hildon-navigator/hn-app-switcher.c	2006-11-24 08:47:30 UTC (rev 8299)
@@ -63,6 +63,8 @@
 #include <libosso.h>
 
 #include <hildon-widgets/gtk-infoprint.h>
+#include <hildon-widgets/hildon-finger.h>
+
 #include "hildon-pixbuf-anim-blinker.h"
 
 
@@ -1006,10 +1008,8 @@
 
 /*  hn_wm_activate (HN_TN_DEACTIVATE_KEY_FOCUS);*/
 
-  if (event->button == APP_BUTTON_THUMBABLE || event->button == 2)
-    {
-      priv->is_thumbable = TRUE;
-    }
+  if (hildon_button_event_is_finger (event))
+    priv->is_thumbable = TRUE;
   else if (!priv->menu_button_timeout)
     priv->is_thumbable = FALSE;
 
@@ -1036,6 +1036,7 @@
   gtk_widget_set_name (button, AS_MENU_BUTTON_NAME);
   gtk_widget_set_sensitive (button, FALSE);
   gtk_widget_set_size_request (button, -1, AS_MENU_BUTTON_HEIGHT);
+  gtk_widget_set_extension_events (button, GDK_EXTENSION_EVENTS_ALL);
 
   g_object_set (G_OBJECT (button),
                 "can-focus", TN_DEFAULT_FOCUS,

Modified: projects/haf/trunk/maemo-af-desktop/hildon-navigator/hn-others-button.c
===================================================================
--- projects/haf/trunk/maemo-af-desktop/hildon-navigator/hn-others-button.c	2006-11-24 08:41:07 UTC (rev 8298)
+++ projects/haf/trunk/maemo-af-desktop/hildon-navigator/hn-others-button.c	2006-11-24 08:47:30 UTC (rev 8299)
@@ -67,6 +67,9 @@
 /* For menu conf dir monitoring */
 #include <hildon-base-lib/hildon-base-dnotify.h>
 
+/* For finger detection */
+#include <hildon-widgets/hildon-finger.h>
+
 #define NAVIGATOR_BUTTON_THREE "hildon-navigator-button-three"
 
 /* Button icon */
@@ -170,6 +173,9 @@
 
   gtk_widget_set_name(GTK_WIDGET(button), NAVIGATOR_BUTTON_THREE);
 
+  gtk_widget_set_extension_events (GTK_WIDGET (button),
+                                   GDK_EXTENSION_EVENTS_ALL);
+
   icon = gtk_image_new_from_pixbuf(get_icon( OTHERS_MENU_ICON_NAME,
 					     OTHERS_MENU_ICON_SIZE ));
 
@@ -897,11 +903,8 @@
 		       button);
     }
 
-  if (event->button == THUMB_BUTTON_ID ||
-      event->button == 2)
-    {
-      button->priv->thumb_pressed = TRUE;
-    }
+  if (hildon_button_event_is_finger (event))
+    button->priv->thumb_pressed = TRUE;
 
   return TRUE;
 }