r1721 - in trunk/src/target/OM-2007/openmoko-libs: . libmokoui

rob at sita.openmoko.org rob at sita.openmoko.org
Tue Apr 10 19:14:58 CEST 2007


Author: rob
Date: 2007-04-10 19:14:57 +0200 (Tue, 10 Apr 2007)
New Revision: 1721

Modified:
   trunk/src/target/OM-2007/openmoko-libs/ChangeLog
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.h
Log:
2007-04-10  Rob Bradford  <rob at openedhand.com>

	* libmokoui/moko-message-dialog.c:
	(moko_message_dialog_set_message):
	* libmokoui/moko-message-dialog.h:
	Give the moko_dialog_set_message function a vsprintf varargs parameter
	and use this when generating the message.

	Patch from Chaowei Song <songcw at fic-sh.com.cn>.



Modified: trunk/src/target/OM-2007/openmoko-libs/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/ChangeLog	2007-04-10 04:20:51 UTC (rev 1720)
+++ trunk/src/target/OM-2007/openmoko-libs/ChangeLog	2007-04-10 17:14:57 UTC (rev 1721)
@@ -1,3 +1,13 @@
+2007-04-10  Rob Bradford  <rob at openedhand.com>
+
+	* libmokoui/moko-message-dialog.c:
+	(moko_message_dialog_set_message):
+	* libmokoui/moko-message-dialog.h:
+	Give the moko_dialog_set_message function a vsprintf varargs parameter
+	and use this when generating the message.
+
+	Patch from Chaowei Song <songcw at fic-sh.com.cn>.
+
 2007-04-06 Dodji Seketeli
 
 	* openmoko-libs/libmokojournal/src/*: moved what

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c	2007-04-10 04:20:51 UTC (rev 1720)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c	2007-04-10 17:14:57 UTC (rev 1721)
@@ -201,13 +201,16 @@
 }
 
 void
-moko_message_dialog_set_message (MokoMessageDialog *dialog, const gchar *new_message)
+moko_message_dialog_set_message (MokoMessageDialog *dialog, const gchar *message_format, ...)
 {
   MokoMessageDialogPrivate* priv = MESSAGE_DIALOG_PRIVATE(dialog);
+  va_list args;
 
   g_free (priv->message);
 
-  priv->message = g_strdup (new_message);
+  va_start (args, message_format);
+  priv->message = g_strdup_vprintf (message_format, args);
+  va_end (args);
 
   gtk_label_set (GTK_LABEL (priv->label), priv->message);
 }

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.h	2007-04-10 04:20:51 UTC (rev 1720)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.h	2007-04-10 17:14:57 UTC (rev 1721)
@@ -58,7 +58,9 @@
 GType moko_message_dialog_get_type (void);
 
 GtkWidget* moko_message_dialog_new (void);
-void moko_message_dialog_set_message (MokoMessageDialog *dialog, const gchar *message);
+void moko_message_dialog_set_message (MokoMessageDialog *dialog,
+    const gchar *message_format,
+    ...)G_GNUC_PRINTF (2, 3);
 void moko_message_dialog_set_image_from_stock (MokoMessageDialog *dialog,
     const gchar *stock_id);
 





More information about the commitlog mailing list