Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r3223 - in trunk/src/target/OM-2007.2/libraries/libmokoui2: .
libmokoui ([EMAIL PROTECTED])
2. r3224 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src
([EMAIL PROTECTED])
3. r3225 -
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/22x22/stock
([EMAIL PROTECTED])
--- Begin Message ---
Author: thomas
Date: 2007-10-18 18:00:21 +0200 (Thu, 18 Oct 2007)
New Revision: 3223
Modified:
trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-hint-entry.h
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-stock.c
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-stock.h
Log:
* libmokoui/moko-hint-entry.h: Correct a macro typo
* libmokoui/moko-stock.c:
* libmokoui/moko-stock.h:
Add MOKO_STOCK_CALL_IGNORE
Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog 2007-10-18
15:25:37 UTC (rev 3222)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog 2007-10-18
16:00:21 UTC (rev 3223)
@@ -1,3 +1,11 @@
+2007-10-18 Thomas Wood <[EMAIL PROTECTED]>
+
+ * libmokoui/moko-hint-entry.h: Correct a macro typo
+
+ * libmokoui/moko-stock.c:
+ * libmokoui/moko-stock.h:
+ Add MOKO_STOCK_CALL_IGNORE
+
2007-10-18 Chris Lord <[EMAIL PROTECTED]>
* libmokoui/moko-finger-scroll.c:
Modified:
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-hint-entry.h
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-hint-entry.h
2007-10-18 15:25:37 UTC (rev 3222)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-hint-entry.h
2007-10-18 16:00:21 UTC (rev 3223)
@@ -34,7 +34,7 @@
#define MOKO_HINT_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
MOKO_TYPE_HINT_ENTRY, MokoHintEntryClass))
#define MOKO_IS_HINT_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE
((obj), MOKO_TYPE_HINT_ENTRY))
#define MOKO_IS_HINT_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
MOKO_TYPE_HINT_ENTRY))
-#define MOKO_HINT_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
MOKO_TYPE_HINT_ENTRY, MokoGroupComboClass))
+#define MOKO_HINT_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
MOKO_TYPE_HINT_ENTRY, MokoHintEntryClass))
/**
* MokoHintEntry:
Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-stock.c
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-stock.c
2007-10-18 15:25:37 UTC (rev 3222)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-stock.c
2007-10-18 16:00:21 UTC (rev 3223)
@@ -39,6 +39,7 @@
{ MOKO_STOCK_CALL_HANGUP, N_("Hang Up"), 0, 0, GETTEXT_PACKAGE },
{ MOKO_STOCK_CALL_HISTORY, N_("History"), 0, 0, GETTEXT_PACKAGE },
{ MOKO_STOCK_CALL_HOLD, N_("Hold"), 0, 0, GETTEXT_PACKAGE },
+ { MOKO_STOCK_CALL_IGNORE, N_("Ignore"), 0, 0, GETTEXT_PACKAGE },
{ MOKO_STOCK_CALL_IN, N_("Received Calls"), 0, 0, GETTEXT_PACKAGE },
{ MOKO_STOCK_CALL_MISSED, N_("Missed Calls"), 0, 0, GETTEXT_PACKAGE },
{ MOKO_STOCK_CALL_REDIAL, N_("Redial"), 0, 0, GETTEXT_PACKAGE },
Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-stock.h
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-stock.h
2007-10-18 15:25:37 UTC (rev 3222)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-stock.h
2007-10-18 16:00:21 UTC (rev 3223)
@@ -41,6 +41,7 @@
#define MOKO_STOCK_CALL_HANGUP "moko-call-hangup"
#define MOKO_STOCK_CALL_HISTORY "moko-call-history"
#define MOKO_STOCK_CALL_HOLD "moko-call-hold"
+#define MOKO_STOCK_CALL_IGNORE "moko-call-ignore"
#define MOKO_STOCK_CALL_IN "moko-history-call-in"
#define MOKO_STOCK_CALL_MISSED "moko-history-call-missed"
#define MOKO_STOCK_CALL_REDIAL "moko-call-redial"
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-10-18 18:01:23 +0200 (Thu, 18 Oct 2007)
New Revision: 3224
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer-textview.c
Log:
* src/moko-dialer-textview.c: (moko_dialer_textview_set_color): Don't
try to format a blank string
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-10-18 16:00:21 UTC (rev 3223)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-10-18 16:01:23 UTC (rev 3224)
@@ -1,5 +1,10 @@
2007-10-18 Thomas Wood <[EMAIL PROTECTED]>
+ * src/moko-dialer-textview.c: (moko_dialer_textview_set_color): Don't
+ try to format a blank string
+
+2007-10-18 Thomas Wood <[EMAIL PROTECTED]>
+
* src/moko-talking.c: (moko_talking_init): Use stock items for
talking/incoming/outgoing page toolbars
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer-textview.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer-textview.c
2007-10-18 16:00:21 UTC (rev 3223)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer-textview.c
2007-10-18 16:01:23 UTC (rev 3224)
@@ -19,8 +19,11 @@
*/
+#include <string.h>
+
#include "moko-dialer-textview.h"
#include "error.h"
+
G_DEFINE_TYPE (MokoDialerTextview, moko_dialer_textview, GTK_TYPE_TEXT_VIEW)
enum
{
@@ -164,6 +167,12 @@
GtkTextIter end;
gint small = 10, medium = 10, large = 10;
+ PangoLayout *pl;
+ gchar *text;
+ int pl_w, pl_h, textview_w, textview_h;
+ GdkWindow *textview_window;
+ gboolean centre_v = TRUE;
+
/* Obtaining the buffer associated with the widget. */
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (moko_dialer_textview));
@@ -174,6 +183,14 @@
gtk_text_buffer_get_start_iter (buffer, &start);
gtk_text_buffer_get_end_iter (buffer, &end);
+ text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
+
+ /* no need to continue if we don't have any text */
+ if (!text)
+ return;
+ if (text && (strlen (text) < 1))
+ return;
+
gint cur = gtk_text_iter_get_offset (&cursoriter);
if (cur > 0)
@@ -203,14 +220,6 @@
gtk_widget_style_get (GTK_WIDGET (moko_dialer_textview), "medium_font",
&medium, NULL);
gtk_widget_style_get (GTK_WIDGET (moko_dialer_textview), "large_font",
&large, NULL);
- PangoLayout *pl;
- gchar *text;
- int pl_w, pl_h, textview_w, textview_h;
- GdkWindow *textview_window;
- gboolean centre_v = TRUE;
-
- g_object_get (G_OBJECT (buffer), "text", &text, NULL);
-
/* create a pango layout to try different text sizes on */
pl = pango_layout_new (gtk_widget_get_pango_context (GTK_WIDGET
(moko_dialer_textview)));
pango_layout_set_text (pl, text, -1);
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-10-18 18:35:48 +0200 (Thu, 18 Oct 2007)
New Revision: 3225
Modified:
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/22x22/stock/moko-contact-address.png
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/22x22/stock/moko-contact-birthday.png
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/22x22/stock/moko-contact-email.png
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/22x22/stock/moko-contact-phone.png
Log:
* icons/openmoko-standard/22x22/stock/moko-contact-address.png
* icons/openmoko-standard/22x22/stock/moko-contact-birthday.png
* icons/openmoko-standard/22x22/stock/moko-contact-email.png
* icons/openmoko-standard/22x22/stock/moko-contact-phone.png
Fix image dimensions
Modified:
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/22x22/stock/moko-contact-address.png
===================================================================
(Binary files differ)
Modified:
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/22x22/stock/moko-contact-birthday.png
===================================================================
(Binary files differ)
Modified:
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/22x22/stock/moko-contact-email.png
===================================================================
(Binary files differ)
Modified:
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/22x22/stock/moko-contact-phone.png
===================================================================
(Binary files differ)
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
