[maemo-commits] [maemo-commits] r15642 - in projects/haf/trunk/hildon-1: . src

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2008-06-10 12:55:09 +0300 (Tue, 10 Jun 2008)
New Revision: 15642

Modified:
   projects/haf/trunk/hildon-1/ChangeLog
   projects/haf/trunk/hildon-1/src/hildon-time-editor.c
Log:
2008-06-10  Michael Natterer  <mitch at imendio.com>

	Merge change from hildon-widgets which makes hildon-1 build
	against latest GTK+ in order to help the migration process from
	diablo to fremantle. This change is 100% backward compatible and
	also builds fine against old GTK+ on diablo.

	* src/hildon-time-editor.c (hildon_time_editor_class_init): The
	widget_class->tap_and_hold_setup signal slot doesn't exist any
	longer, stop overriding it.

	(hildon_time_editor_init): g_signal_connect() to the
	tap-and-hold-setup signal instead.

	(hildon_time_editor_entry_keypress): add cast to fix warning.



Modified: projects/haf/trunk/hildon-1/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-1/ChangeLog	2008-06-09 13:47:22 UTC (rev 15641)
+++ projects/haf/trunk/hildon-1/ChangeLog	2008-06-10 09:55:09 UTC (rev 15642)
@@ -1,3 +1,19 @@
+2008-06-10  Michael Natterer  <mitch at imendio.com>
+
+	Merge change from hildon-widgets which makes hildon-1 build
+	against latest GTK+ in order to help the migration process from
+	diablo to fremantle. This change is 100% backward compatible and
+	also builds fine against old GTK+ on diablo.
+
+	* src/hildon-time-editor.c (hildon_time_editor_class_init): The
+	widget_class->tap_and_hold_setup signal slot doesn't exist any
+	longer, stop overriding it.
+
+	(hildon_time_editor_init): g_signal_connect() to the
+	tap-and-hold-setup signal instead.
+
+	(hildon_time_editor_entry_keypress): add cast to fix warning.
+
 2008-04-15 18:05:19    <timj at imendio.com>
 
 	* src/hildon-banner.c: revert the recent change, that introduced

Modified: projects/haf/trunk/hildon-1/src/hildon-time-editor.c
===================================================================
--- projects/haf/trunk/hildon-1/src/hildon-time-editor.c	2008-06-09 13:47:22 UTC (rev 15641)
+++ projects/haf/trunk/hildon-1/src/hildon-time-editor.c	2008-06-10 09:55:09 UTC (rev 15642)
@@ -366,9 +366,6 @@
     object_class->set_property                  = hildon_time_editor_set_property;
     widget_class->size_request                  = hildon_time_editor_size_request;
     widget_class->size_allocate                 = hildon_time_editor_size_allocate;
-#ifdef MAEMO_GTK 
-    widget_class->tap_and_hold_setup            = hildon_time_editor_tap_and_hold_setup;
-#endif
     widget_class->focus                         = hildon_time_editor_focus;
 
     container_class->forall                     = hildon_time_editor_forall;
@@ -609,6 +606,13 @@
     hildon_time_editor_set_to_current_time (editor);
 
     gtk_widget_pop_composite_child ();
+
+#ifdef MAEMO_GTK 
+    g_signal_connect (editor, "tap-and-hold-setup",
+                      G_CALLBACK (hildon_time_editor_tap_and_hold_setup),
+                      NULL);
+#endif
+
 }
 
 static void 
@@ -1821,7 +1825,7 @@
     {
     case GDK_Return:
     case GDK_ISO_Enter:
-      hildon_time_editor_icon_clicked (entry, data);
+      hildon_time_editor_icon_clicked (GTK_WIDGET (entry), data);
       return TRUE;
     default:
       return FALSE;