[maemo-commits] [maemo-commits] r16696 - in projects/haf/branches/hildon-fm/fremantle: . debian hildon-fm

[From: subversion at stage.maemo.org]

Author: risun
Date: 2008-11-17 14:51:06 +0200 (Mon, 17 Nov 2008)
New Revision: 16696

Modified:
   projects/haf/branches/hildon-fm/fremantle/ChangeLog
   projects/haf/branches/hildon-fm/fremantle/debian/changelog
   projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-chooser-dialog.c
   projects/haf/branches/hildon-fm/fremantle/hildon-fm/t.c
Log:
update for passing integration

Modified: projects/haf/branches/hildon-fm/fremantle/ChangeLog
===================================================================
--- projects/haf/branches/hildon-fm/fremantle/ChangeLog	2008-11-17 12:49:48 UTC (rev 16695)
+++ projects/haf/branches/hildon-fm/fremantle/ChangeLog	2008-11-17 12:51:06 UTC (rev 16696)
@@ -1,3 +1,9 @@
+2008-11-17 Richard Sun  <richard.sun at nokia.com>
+
+	* debian/changelog, hildon-fm/t.c,
+	hildon-fm/hildon-file-chooser-dialog.c: fix compile warning to pass
+	integration robot
+
 2008-11-05 Yang Li <yang.li at d\igia.com>
 	* hildon-fm/hildon-file-chooser-dialog.c:
 	use null as the device name if failed to get the actual device name

Modified: projects/haf/branches/hildon-fm/fremantle/debian/changelog
===================================================================
--- projects/haf/branches/hildon-fm/fremantle/debian/changelog	2008-11-17 12:49:48 UTC (rev 16695)
+++ projects/haf/branches/hildon-fm/fremantle/debian/changelog	2008-11-17 12:51:06 UTC (rev 16696)
@@ -1,13 +1,13 @@
-libhildonfm (1:2.0.10) unresleased
-	
-	* New property "edit-mode" introduced
-	* List view is replaced by a dummy GtkTreeView and hidden
-	* No more row insensitive message in Hildon 2.2 UI style
-	* Speed up populating of a file system model by skipping search when 
-	adding new nodes. Few other enhancements too.
+libhildonfm (1:2.0.10) unstable; urgency=low
 
--- Valentin Rabinovich <valentin.rabinovich at d\igia.com>  Thu, 02 Oct 2008 15:02:50 +0300
+  * New property "edit-mode" introduced
+  * List view is replaced by a dummy GtkTreeView and hidden
+  * No more row insensitive message in Hildon 2.2 UI style
+  * Speed up populating of a file system model by skipping search when 
+    adding new nodes. Few other enhancements too.
 
+ -- Valentin Rabinovich <valentin.rabinovich at d\igia.com>  Thu, 02 Oct 2008 15:02:50 +0300
+
 libhildonfm (1:2.0.7) unstable; urgency=low
 
   * Ported "Change Folder", "Move to folder", "Open file" and "Select file

Modified: projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-chooser-dialog.c
===================================================================
--- projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-chooser-dialog.c	2008-11-17 12:49:48 UTC (rev 16695)
+++ projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-chooser-dialog.c	2008-11-17 12:51:06 UTC (rev 16696)
@@ -1524,6 +1524,7 @@
   }
 }
 
+/**
 static gboolean hildon_file_chooser_dialog_location_pressed(GtkWidget
   *widget, GdkEventButton *event, gpointer data)
 {
@@ -1539,6 +1540,7 @@
 
   return FALSE;
 }
+**/
 
 static void response_handler(GtkWidget * widget, gint arg1, gpointer data)
 {
@@ -2651,15 +2653,17 @@
 static void hildon_chooser_dialog_extension_button_clicked(GtkWidget *widget,
 							   gpointer   data)
 {
+	/**
   GtkDialog *dialog;
   GtkWidget *selector;
+  **/
   gint result;
   
-  //g_assert(IS_HILDON_TOUCH_SELECTOR (data));
-  selector = HILDON_TOUCH_SELECTOR (data);
+  g_assert(HILDON_IS_TOUCH_SELECTOR (data));
+  //selector = HILDON_TOUCH_SELECTOR (data);
   //dialog = GTK_DIALOG(selector);
   printf("yang: dialog created\n");
-  result = gtk_dialog_run (GTK_DIALOG (selector));
+  result = gtk_dialog_run (GTK_DIALOG (data));
   switch (result)
   {
      case GTK_RESPONSE_OK:
@@ -2717,7 +2721,7 @@
   g_signal_connect(G_OBJECT(button), "clicked",
 		   G_CALLBACK(hildon_chooser_dialog_extension_button_clicked), 
 		   selector);
-  hildon_picker_button_set_selector (HILDON_BUTTON (button), HILDON_TOUCH_SELECTOR (selector));
+  hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (button), HILDON_TOUCH_SELECTOR (selector));
   gtk_button_set_alignment(GTK_BUTTON(button), 0, 0.5);
   hildon_button_set_title(HILDON_BUTTON(button), _("sfil_fi_save_object_dialog_type"));
   hildon_button_set_title(HILDON_BUTTON(button), NULL);

Modified: projects/haf/branches/hildon-fm/fremantle/hildon-fm/t.c
===================================================================
--- projects/haf/branches/hildon-fm/fremantle/hildon-fm/t.c	2008-11-17 12:49:48 UTC (rev 16695)
+++ projects/haf/branches/hildon-fm/fremantle/hildon-fm/t.c	2008-11-17 12:51:06 UTC (rev 16696)
@@ -57,6 +57,8 @@
 
 static gboolean create_main_window();
 static gboolean create_file_selection();
+gboolean ut_close (GtkWidget *window, GdkEvent *ev,
+		                   gpointer userdata);
 
 static void save_as_clicked( GtkWidget *widget,
 				gpointer   data )
@@ -118,7 +120,7 @@
 static void system_model_test_clicked( GtkWidget *widget,
 				       gpointer   data )
 {
-  GtkTreeIter   *iter;
+  GtkTreeIter   *iter = NULL;
   print_info ("testing API 'hildon_file_system_model_search_uri'\n");
   print_info ("------------------------------------------------\n");
   print_info ("pass the parameter:\n");