r1945 - in trunk/src/target/OM-2007/openmoko-libs: . libmokogsmd libmokoui
thomas at sita.openmoko.org
thomas at sita.openmoko.org
Thu May 10 15:54:49 CEST 2007
Author: thomas
Date: 2007-05-10 15:54:47 +0200 (Thu, 10 May 2007)
New Revision: 1945
Modified:
trunk/src/target/OM-2007/openmoko-libs/ChangeLog
trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-connection.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-stock.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-stock.h
Log:
* libmokogsmd/moko-gsmd-connection.h: Include gsmd/error.h (for enums)
* libmokoui/moko-message-dialog.c:
(moko_message_dialog_realize_cb): Add some error trapping
* libmokoui/moko-stock.c:
* libmokoui/moko-stock.h: Add MOKO_STOCK_HANDSET
Modified: trunk/src/target/OM-2007/openmoko-libs/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-05-10 11:55:54 UTC (rev 1944)
+++ trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-05-10 13:54:47 UTC (rev 1945)
@@ -1,3 +1,11 @@
+2007-05-10 Thomas Wood <thomas at openedhand.com>
+
+ * libmokogsmd/moko-gsmd-connection.h: Include gsmd/error.h (for enums)
+ * libmokoui/moko-message-dialog.c:
+ (moko_message_dialog_realize_cb): Add some error trapping
+ * libmokoui/moko-stock.c:
+ * libmokoui/moko-stock.h: Add MOKO_STOCK_HANDSET
+
2007-05-09 Thomas Wood <thomas at openedhand.com>
* libmokoui/moko-message-dialog.c:
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-connection.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-connection.h 2007-05-10 11:55:54 UTC (rev 1944)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-connection.h 2007-05-10 13:54:47 UTC (rev 1945)
@@ -19,6 +19,7 @@
#define _MOKO_GSMD_CONNECTION_H_
#include <glib-object.h>
+#include <gsmd/event.h>
G_BEGIN_DECLS
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-10 11:55:54 UTC (rev 1944)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c 2007-05-10 13:54:47 UTC (rev 1945)
@@ -205,8 +205,15 @@
if (priv->background_pixbuf == NULL)
{
- g_warning ("Error loading background pixbuf: %s", error->message);
- g_clear_error (&error);
+ if (error)
+ {
+ g_warning ("Error loading background pixbuf: %s", error->message);
+ g_clear_error (&error);
+ }
+ else
+ {
+ g_warning ("Error loading background pixbuf");
+ }
return;
}
}
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-stock.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-stock.c 2007-05-10 11:55:54 UTC (rev 1944)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-stock.c 2007-05-10 13:54:47 UTC (rev 1945)
@@ -47,6 +47,7 @@
{ MOKO_STOCK_PHONE_BOOK, N_("Phone Book"), 0, 0, GETTEXT_PACKAGE },
{ MOKO_STOCK_SMS_NEW, N_("New SMS"), 0, 0, GETTEXT_PACKAGE },
{ MOKO_STOCK_SPEAKER, N_("Speaker"), 0, 0, GETTEXT_PACKAGE },
+ { MOKO_STOCK_HANDSET, N_("Handset"), 0, 0, GETTEXT_PACKAGE },
{ MOKO_STOCK_VIEW, N_("View"), 0, 0, GETTEXT_PACKAGE },
};
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-stock.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-stock.h 2007-05-10 11:55:54 UTC (rev 1944)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-stock.h 2007-05-10 13:54:47 UTC (rev 1945)
@@ -56,6 +56,7 @@
#define MOKO_STOCK_PHONE_BOOK "moko-stock-phone-book"
#define MOKO_STOCK_SMS_NEW "moko-stock-new-sms"
#define MOKO_STOCK_SPEAKER "moko-stock-speaker"
+#define MOKO_STOCK_HANDSET "moko-stock-handset"
#define MOKO_STOCK_VIEW "moko-stock-view"
More information about the commitlog
mailing list