r3370 - in trunk/src/target/OM-2007.2/applications/openmoko-appmanager2: . src

thomas at sita.openmoko.org thomas at sita.openmoko.org
Wed Nov 7 16:54:28 CET 2007


Author: thomas
Date: 2007-11-07 16:54:27 +0100 (Wed, 07 Nov 2007)
New Revision: 3370

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/am-progress-dialog.h
   trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/ipkg-utils.c
Log:
* src/am-progress-dialog.h:
* src/ipkg-utils.c:

Fix compiler warnings


Modified: trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/ChangeLog	2007-11-07 15:38:56 UTC (rev 3369)
+++ trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/ChangeLog	2007-11-07 15:54:27 UTC (rev 3370)
@@ -1,5 +1,12 @@
 2007-11-07  Thomas Wood  <thomas at openedhand.com>
 
+	* src/am-progress-dialog.h:
+	* src/ipkg-utils.c:
+
+	Fix compiler warnings
+
+2007-11-07  Thomas Wood  <thomas at openedhand.com>
+
 	* src/appmanager-window.c: (main): Request a package list update if the
 	package list could not be opened.
 

Modified: trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/am-progress-dialog.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/am-progress-dialog.h	2007-11-07 15:38:56 UTC (rev 3369)
+++ trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/am-progress-dialog.h	2007-11-07 15:54:27 UTC (rev 3370)
@@ -44,6 +44,7 @@
 
 void am_progress_dialog_append_details_text (AmProgressDialog *dialog, gchar *text);
 void am_progress_dialog_set_progress (AmProgressDialog *dialog, gdouble fraction);
+void am_progress_dialog_set_label_text (AmProgressDialog *dialog, gchar *text);
 
 G_END_DECLS
 

Modified: trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/ipkg-utils.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/ipkg-utils.c	2007-11-07 15:38:56 UTC (rev 3369)
+++ trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/ipkg-utils.c	2007-11-07 15:54:27 UTC (rev 3370)
@@ -34,7 +34,7 @@
 {
   int ret;
   gchar *real_name;
-  gchar *success_string, *failure_string;
+  gchar *success_string, *failure_string, *s;
 
   if (!data->remove)
   {
@@ -51,26 +51,22 @@
 
   if (ret == 0)
   {
-    gdk_threads_enter ();
-    am_progress_dialog_set_progress (data->progress_dialog, 1);
-    am_progress_dialog_append_details_text (data->progress_dialog, success_string);
-    am_progress_dialog_set_label_text (data->progress_dialog, success_string);
-    gdk_threads_leave ();
+    s = success_string;
   }
   else
   {
-    gchar *err;
+    s = failure_string;
+  }
+  gchar *err;
 
-    err = get_error_msg ();
-
-    gdk_threads_enter ();
-    am_progress_dialog_set_progress (data->progress_dialog, 1);
-    am_progress_dialog_append_details_text (data->progress_dialog, failure_string);
-    am_progress_dialog_set_label_text (data->progress_dialog, failure_string);
-    am_progress_dialog_append_details_text (data->progress_dialog, err);
-    gdk_threads_leave ();
+  err = get_error_msg ();  
   
-  }
+  gdk_threads_enter ();
+  am_progress_dialog_set_progress (AM_PROGRESS_DIALOG (data->progress_dialog), 1);
+  am_progress_dialog_append_details_text (AM_PROGRESS_DIALOG (data->progress_dialog), s);
+  am_progress_dialog_set_label_text (AM_PROGRESS_DIALOG (data->progress_dialog), s);
+  am_progress_dialog_append_details_text (AM_PROGRESS_DIALOG (data->progress_dialog), err);
+  gdk_threads_leave ();
 
   g_free (data);
 





More information about the commitlog mailing list