r1938 - in trunk/src/target/OM-2007/openmoko-libs: . libmokoui
thomas at sita.openmoko.org
thomas at sita.openmoko.org
Wed May 9 17:30:56 CEST 2007
Author: thomas
Date: 2007-05-09 17:30:54 +0200 (Wed, 09 May 2007)
New Revision: 1938
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-05-09 Thomas Wood <thomas at openedhand.com>
* libmokoui/moko-message-dialog.c:
(moko_message_dialog_set_message),
(moko_message_dialog_set_image_from_stock):
* libmokoui/moko-message-dialog.h:
Add moko_message_dialog_set_image () and replace some deprecated functions
Modified: trunk/src/target/OM-2007/openmoko-libs/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-05-09 14:36:24 UTC (rev 1937)
+++ trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-05-09 15:30:54 UTC (rev 1938)
@@ -1,5 +1,13 @@
2007-05-09 Thomas Wood <thomas at openedhand.com>
+ * libmokoui/moko-message-dialog.c:
+ (moko_message_dialog_set_message),
+ (moko_message_dialog_set_image_from_stock):
+ * libmokoui/moko-message-dialog.h:
+ Add moko_message_dialog_set_image () and replace some deprecated functions
+
+2007-05-09 Thomas Wood <thomas at openedhand.com>
+
* libmokoui/moko-application.c: (moko_application_init):
* libmokoui/moko-stock.c: (moko_stock_register):
* libmokoui/moko-stock.h:
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-05-09 14:36:24 UTC (rev 1937)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c 2007-05-09 15:30:54 UTC (rev 1938)
@@ -319,7 +319,7 @@
priv->message = g_strdup_vprintf (message_format, args);
va_end (args);
- gtk_label_set (GTK_LABEL (priv->label), priv->message);
+ gtk_label_set_text (GTK_LABEL (priv->label), priv->message);
}
void
@@ -340,6 +340,27 @@
g_object_unref (old_image);
}
+
+void
+moko_message_dialog_set_image (MokoMessageDialog *dialog, GtkWidget *image)
+{
+ MokoMessageDialogPrivate* priv = MESSAGE_DIALOG_PRIVATE(dialog);
+ GtkWidget *old_image = priv->image;
+
+ priv->image = image;
+
+ if (old_image != NULL)
+ gtk_container_remove (GTK_CONTAINER (priv->image_alignment), old_image);
+
+ gtk_container_add (GTK_CONTAINER (priv->image_alignment), priv->image);
+ gtk_widget_show_all (GTK_WIDGET (priv->image_alignment));
+
+ if (old_image !=NULL)
+ g_object_unref (old_image);
+}
+
+
+
GtkWidget*
moko_message_dialog_new (void)
{
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-05-09 14:36:24 UTC (rev 1937)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.h 2007-05-09 15:30:54 UTC (rev 1938)
@@ -63,6 +63,7 @@
...)G_GNUC_PRINTF (2, 3);
void moko_message_dialog_set_image_from_stock (MokoMessageDialog *dialog,
const gchar *stock_id);
+void moko_message_dialog_set_image (MokoMessageDialog *dialog, GtkWidget *image);
G_END_DECLS
More information about the commitlog
mailing list