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. r3052 - in trunk/src/target/OM-2007.2/libraries/libmokoui2: .
libmokoui ([EMAIL PROTECTED])
2. r3053 - in trunk/src/target/OM-2007.2/libraries/libmokoui2: .
libmokoui ([EMAIL PROTECTED])
--- Begin Message ---
Author: thomas
Date: 2007-09-27 17:56:20 +0200 (Thu, 27 Sep 2007)
New Revision: 3052
Modified:
trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-hint-entry.c
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-hint-entry.h
Log:
* libmokoui/moko-hint-entry.c:
* libmokoui/moko-hint-entry.h:
Replace moko_hint_entry_clear() with moko_hint_entry_set_text()
Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog 2007-09-27
02:53:12 UTC (rev 3051)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog 2007-09-27
15:56:20 UTC (rev 3052)
@@ -1,3 +1,10 @@
+2007-09-27 Thomas Wood <[EMAIL PROTECTED]>
+
+ * libmokoui/moko-hint-entry.c:
+ * libmokoui/moko-hint-entry.h:
+
+ Replace moko_hint_entry_clear() with moko_hint_entry_set_text()
+
2007-09-26 Thomas Wood <[EMAIL PROTECTED]>
* libmokoui/moko-stock.c: (_moko_stock_add_icon): Don't create empty
Modified:
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-hint-entry.c
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-hint-entry.c
2007-09-27 02:53:12 UTC (rev 3051)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-hint-entry.c
2007-09-27 15:56:20 UTC (rev 3052)
@@ -214,18 +214,19 @@
}
/**
- * moko_hint_entry_clear:
+ * moko_hint_entry_set_text:
* @entry: a #MokoHintEntry
+ * @text: the next text
*
* Clear the text in the entry and if the widget is not focused, display the
* hint text.
*/
void
-moko_hint_entry_clear (MokoHintEntry *entry)
+moko_hint_entry_set_text (MokoHintEntry *entry, const gchar *text)
{
g_return_if_fail (MOKO_IS_HINT_ENTRY (entry));
- gtk_entry_set_text (GTK_ENTRY (entry), "");
+ gtk_entry_set_text (GTK_ENTRY (entry), text);
update (entry);
}
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-09-27 02:53:12 UTC (rev 3051)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-hint-entry.h
2007-09-27 15:56:20 UTC (rev 3052)
@@ -56,7 +56,7 @@
GtkWidget* moko_hint_entry_new (const char *hint);
-void moko_hint_entry_clear (MokoHintEntry *entry);
+void moko_hint_entry_set_text (MokoHintEntry *entry, const gchar* text);
gboolean moko_hint_entry_is_empty (MokoHintEntry *entry);
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2007-09-27 18:45:06 +0200 (Thu, 27 Sep 2007)
New Revision: 3053
Modified:
trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-hint-entry.c
Log:
* libmokoui/moko-hint-entry.c: (moko_hint_entry_set_text):
Make sure to reset the hinting status before setting text
Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog 2007-09-27
15:56:20 UTC (rev 3052)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog 2007-09-27
16:45:06 UTC (rev 3053)
@@ -1,3 +1,8 @@
+2007-09-27 Chris Lord <[EMAIL PROTECTED]>
+
+ * libmokoui/moko-hint-entry.c: (moko_hint_entry_set_text):
+ Make sure to reset the hinting status before setting text
+
2007-09-27 Thomas Wood <[EMAIL PROTECTED]>
* libmokoui/moko-hint-entry.c:
Modified:
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-hint-entry.c
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-hint-entry.c
2007-09-27 15:56:20 UTC (rev 3052)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-hint-entry.c
2007-09-27 16:45:06 UTC (rev 3053)
@@ -224,10 +224,18 @@
void
moko_hint_entry_set_text (MokoHintEntry *entry, const gchar *text)
{
+ MokoHintEntryPrivate *priv;
+
g_return_if_fail (MOKO_IS_HINT_ENTRY (entry));
+ priv = GET_PRIVATE (entry);
+ if (priv->state == STATE_HINTING) {
+ priv->state = STATE_ENTRY;
+ gtk_widget_modify_text (GTK_WIDGET (entry), GTK_STATE_NORMAL, NULL);
+ }
+
gtk_entry_set_text (GTK_ENTRY (entry), text);
-
+
update (entry);
}
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
