r1357 - trunk/src/target/OM-2007/applications/openmoko-mainmenu/src

[zhiyong_sun at sita.openmoko.org]

Author: zhiyong_sun
Date: 2007-03-14 03:55:14 +0100 (Wed, 14 Mar 2007)
New Revision: 1357

Modified:
   trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/dbus-conn.h
   trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.c
Log:
change item activate function.

Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/dbus-conn.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/dbus-conn.h	2007-03-14 02:25:14 UTC (rev 1356)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/dbus-conn.h	2007-03-14 02:55:14 UTC (rev 1357)
@@ -20,6 +20,10 @@
  */
 #ifndef MOKO_DBUS_MESSAGE_SEND_H
 #define MOKO_DBUS_MESSAGE_SEND_H
+
+#ifndef DBUS_API_SUBJECT_TO_CHANGE
+#define DBUS_API_SUBJECT_TO_CHANGE
+#endif /*DBUS_API_SUBJECT_TO_CHANGE*/
 #include <glib.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus.h>

Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.c	2007-03-14 02:25:14 UTC (rev 1356)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.c	2007-03-14 02:55:14 UTC (rev 1357)
@@ -99,7 +99,6 @@
   gint decr_width;
   gboolean decorated;
   gint total_items;
-  gboolean activate;
 
   guint ctrl_pressed : 1;
   guint shift_pressed : 1;
@@ -1507,10 +1506,9 @@
 
   if (event->button == 1 && event->type == GDK_BUTTON_PRESS)
     {
-
       item = moko_icon_view_get_item_at_pos (icon_view,
 					    event->x, event->y);
-      
+
       if (item != NULL)
 	{
 	  moko_icon_view_scroll_to_item (icon_view, item);
@@ -1526,9 +1524,9 @@
 
 	      moko_icon_view_set_cursor_item (icon_view, item);
 	      if (!icon_view->priv->anchor_item)
-		icon_view->priv->anchor_item = item;
+		    icon_view->priv->anchor_item = item;
 	      else 
-		moko_icon_view_select_all_between (icon_view,
+		    moko_icon_view_select_all_between (icon_view,
 						  icon_view->priv->anchor_item,
 						  item);
 	      dirty = TRUE;
@@ -1547,13 +1545,20 @@
 		{
 		  if (!item->selected)
 		    {
-		      moko_icon_view_unselect_all_internal (icon_view);
-		      
+			  moko_icon_view_unselect_all_internal (icon_view);
 		      item->selected = TRUE;
 		      moko_icon_view_queue_draw_item (icon_view, item);
 		      dirty = TRUE;
 		    }
-		  else icon_view->priv->activate = TRUE;
+		  else 
+	        {
+	           GtkTreePath *path;
+	           path = gtk_tree_path_new_from_indices (item->index, -1);
+	           moko_icon_view_item_activated (icon_view, path);
+	           gtk_tree_path_free (path);
+
+               icon_view->priv->last_single_clicked = NULL;
+		  }
 		}
 	      moko_icon_view_set_cursor_item (icon_view, item);
 	      icon_view->priv->anchor_item = item;
@@ -1583,23 +1588,6 @@
 	}
 
     }
-
-  if (event->button == 1 && event->type == GDK_2BUTTON_PRESS)
-    {
-      item = moko_icon_view_get_item_at_pos (icon_view,
-					    event->x, event->y);
-
-      if (item && item == icon_view->priv->last_single_clicked)
-	{
-	  GtkTreePath *path;
-
-	  path = gtk_tree_path_new_from_indices (item->index, -1);
-	  moko_icon_view_item_activated (icon_view, path);
-	  gtk_tree_path_free (path);
-	}
-
-      icon_view->priv->last_single_clicked = NULL;
-    }
   
   if (dirty)
     g_signal_emit (icon_view, moko_icon_view_signals[SELECTION_CHANGED], 0);