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

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-05-15 16:47:19 +0200 (Tue, 15 May 2007)
New Revision: 1959

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-stock.c
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-stock.h
Log:
* libmokoui/moko-message-dialog.c: (moko_message_dialog_map): Check for
NULL before using g_object_unref(), as the inbuilt assertion is not
available in openembedded.
* libmokoui/moko-stock.c:
* libmokoui/moko-stock.h:
Add two more stock items


Modified: trunk/src/target/OM-2007/openmoko-libs/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/ChangeLog	2007-05-15 12:25:08 UTC (rev 1958)
+++ trunk/src/target/OM-2007/openmoko-libs/ChangeLog	2007-05-15 14:47:19 UTC (rev 1959)
@@ -1,3 +1,12 @@
+2007-05-15  Thomas Wood  <thomas at openedhand.com>
+
+	* libmokoui/moko-message-dialog.c: (moko_message_dialog_map): Check for
+	NULL before using g_object_unref(), as the inbuilt assertion is not
+	available in openembedded.
+	* libmokoui/moko-stock.c:
+	* libmokoui/moko-stock.h:
+	Add two more stock items
+
 2007-05-10  Thomas Wood  <thomas at openedhand.com>
 
 	* libmokogsmd/moko-gsmd-connection.h: Include gsmd/error.h (for enums)

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-15 12:25:08 UTC (rev 1958)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c	2007-05-15 14:47:19 UTC (rev 1959)
@@ -125,10 +125,14 @@
 
   old_pixbuf = priv->root_pixbuf;
   priv->root_pixbuf = root_pixbuf;
-  g_object_unref (old_pixbuf);
+  if (old_pixbuf)
+    g_object_unref (old_pixbuf);
 
-  g_object_unref (priv->pixbuf);
-  priv->pixbuf = NULL;
+  if (priv->pixbuf)
+  {
+    g_object_unref (priv->pixbuf);
+    priv->pixbuf = NULL;
+  }
 
   if (GTK_WIDGET_CLASS (moko_message_dialog_parent_class)->map)
     GTK_WIDGET_CLASS (moko_message_dialog_parent_class)->map (object);

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-15 12:25:08 UTC (rev 1958)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-stock.c	2007-05-15 14:47:19 UTC (rev 1959)
@@ -26,9 +26,11 @@
 
 static const GtkStockItem moko_items [] =
 {
+  { MOKO_STOCK_CALL_ANSWER, N_("Answer"), 0, 0, GETTEXT_PACKAGE },
   { MOKO_STOCK_CALL_HANGUP, N_("Hang Up"), 0, 0, GETTEXT_PACKAGE },
   { MOKO_STOCK_CALL_HOLD, N_("Hold"), 0, 0, GETTEXT_PACKAGE },
   { MOKO_STOCK_CALL_REDIAL, N_("Redial"), 0, 0, GETTEXT_PACKAGE },
+  { MOKO_STOCK_CALL_REJECT, N_("Reject"), 0, 0, GETTEXT_PACKAGE },
   { MOKO_STOCK_CONTACT_ADDRESS, N_("Address"), 0, 0, GETTEXT_PACKAGE },
   { MOKO_STOCK_CONTACT_DELETE, N_("Delete Contact"), 0, 0, GETTEXT_PACKAGE },
   { MOKO_STOCK_CONTACT_EMAIL, N_("E-Mail"), 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-15 12:25:08 UTC (rev 1958)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-stock.h	2007-05-15 14:47:19 UTC (rev 1959)
@@ -35,9 +35,11 @@
 #ifndef _MOKO_STOCK_H_
 #define _MOKO_STOCK_H_
 
+#define MOKO_STOCK_CALL_ANSWER "moko-stock-call-answer"
 #define MOKO_STOCK_CALL_HANGUP "moko-stock-call-hangup"
 #define MOKO_STOCK_CALL_HOLD "moko-stock-call-hold"
 #define MOKO_STOCK_CALL_REDIAL "moko-stock-call-redial"
+#define MOKO_STOCK_CALL_REJECT "moko-stock-call-reject"
 #define MOKO_STOCK_CONTACT_ADDRESS "moko-stock-contact-address"
 #define MOKO_STOCK_CONTACT_DELETE "moko-stock-contact-delete"
 #define MOKO_STOCK_CONTACT_EMAIL "moko-stock-contact-email"