[maemo-commits] [maemo-commits] r12426 - in projects/haf/trunk/hildon-desktop: . libhildondesktop

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-06-21 16:31:12 +0300 (Thu, 21 Jun 2007)
New Revision: 12426

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-home-item.c
Log:

2007-06-21  Johan Bilien  <johan.bilien at nokia.com>

	* libhildondesktop/hildon-desktop-picture.c:
	- fixed changing of states



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-21 13:03:01 UTC (rev 12425)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-21 13:31:12 UTC (rev 12426)
@@ -1,5 +1,10 @@
 2007-06-21  Johan Bilien  <johan.bilien at nokia.com>
 
+	* libhildondesktop/hildon-desktop-picture.c:
+	- fixed changing of states
+
+2007-06-21  Johan Bilien  <johan.bilien at nokia.com>
+
 	* libhildondesktop/hildon-home-area.c:
 	- fixed handling of the damage events
 	* libhildondesktop/hildon-desktop-picture.c:

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-home-item.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-home-item.c	2007-06-21 13:03:01 UTC (rev 12425)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-home-item.c	2007-06-21 13:31:12 UTC (rev 12426)
@@ -1429,13 +1429,13 @@
       if (event->window == priv->resize_handle_window)
         {
           hildon_desktop_home_item_set_state (HILDON_DESKTOP_HOME_ITEM (w),
-                                              HILDON_DESKTOP_HOME_ITEM_STATE_MOVING,
+                                              HILDON_DESKTOP_HOME_ITEM_STATE_RESIZING,
                                               event);
         }
       else
         {
           hildon_desktop_home_item_set_state (HILDON_DESKTOP_HOME_ITEM (w),
-                                              HILDON_DESKTOP_HOME_ITEM_STATE_RESIZING,
+                                              HILDON_DESKTOP_HOME_ITEM_STATE_MOVING,
                                               event);
         }
 
@@ -1544,8 +1544,6 @@
         g_signal_emit_by_name (G_OBJECT (widget->parent),
                                "applet-change-end",
                                widget);
-
-      priv->state = HILDON_DESKTOP_HOME_ITEM_STATE_NORMAL;
     }
 
   else
@@ -1585,8 +1583,6 @@
               priv->y_offset = widget->allocation.height -
                   window_y - event->y;
             }
-
-          priv->state = HILDON_DESKTOP_HOME_ITEM_STATE_RESIZING;
         }
 
       else
@@ -1610,12 +1606,12 @@
               priv->x_offset = event->x;
               priv->y_offset = event->y;
             }
-          priv->state = HILDON_DESKTOP_HOME_ITEM_STATE_MOVING;
         }
 
 
     }
 
+  priv->state = state;
   g_object_notify (G_OBJECT (widget), "state");
 }