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. r2962 - in
trunk/src/target/OM-2007.2/applications/openmoko-today2: . src
([EMAIL PROTECTED])
2. r2963 -
trunk/src/target/OM-2007.2/applications/openmoko-today2
([EMAIL PROTECTED])
3. r2964 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src
([EMAIL PROTECTED])
4. r2965 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src
([EMAIL PROTECTED])
--- Begin Message ---
Author: chris
Date: 2007-09-13 12:18:44 +0200 (Thu, 13 Sep 2007)
New Revision: 2962
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-launcher.c
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today.h
Log:
Fix bug with empty search and use MokoSearchBar in openmoko-today2
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-09-13 09:16:53 UTC (rev 2961)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-09-13 10:18:44 UTC (rev 2962)
@@ -1,7 +1,17 @@
+2007-09-13 Chris Lord,,, <[EMAIL PROTECTED]>
+
+ * src/today-launcher.c: (today_launcher_update_search),
+ (today_launcher_filter_changed_cb),
+ (today_launcher_combo_changed_cb),
+ (today_launcher_search_toggle_cb), (today_launcher_page_create):
+ * src/today.h:
+ Fix bug with empty search and use MokoSearchBar
+
2007-09-11 Thomas Wood <[EMAIL PROTECTED]>
- * src/today-main.c: (main): Remove disabling of focus on the notebook
tabs to
- try and fix bugs 723 and 724
+ * src/today-main.c: (main):
+ Remove disabling of focus on the notebook tabs to try and fix bugs
+ 723 and 724
2007-09-05 Chris Lord,,, <[EMAIL PROTECTED]>
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-launcher.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-launcher.c
2007-09-13 09:16:53 UTC (rev 2961)
+++
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-launcher.c
2007-09-13 10:18:44 UTC (rev 2962)
@@ -8,6 +8,7 @@
#include <libtaku/taku-table.h>
#include <libtaku/taku-launcher-tile.h>
#include <moko-finger-scroll.h>
+#include <moko-search-bar.h>
#include "today.h"
/* NOTE: Following 4 functions (as well as libtaku) taken from
@@ -234,7 +235,7 @@
TAKU_ICON_TILE (tile)), -1);
desc = g_utf8_strup (taku_icon_tile_get_secondary (
TAKU_ICON_TILE (tile)), -1);
- if (strstr (name, search_string) ||
+ if ((!search_string) || strstr (name, search_string) ||
strstr (desc, search_string)) {
taku_launcher_tile_add_group (TAKU_LAUNCHER_TILE (tile),
data->search_cat);
@@ -245,7 +246,8 @@
}
static void
-today_launcher_filter_changed_cb (GtkEditable *editable, TodayData *data)
+today_launcher_filter_changed_cb (MokoSearchBar *bar, GtkEditable *editable,
+ TodayData *data)
{
gchar *search_string;
@@ -260,37 +262,31 @@
}
static void
-today_launcher_search_toggle_cb (GtkWidget *button, TodayData *data)
+today_launcher_combo_changed_cb (MokoSearchBar *bar, GtkComboBox *widget,
+ TodayData *data)
{
- g_object_set (G_OBJECT (data->search_entry), "visible",
- !GTK_WIDGET_VISIBLE (data->search_entry), NULL);
- g_object_set (G_OBJECT (data->filter_combo), "visible",
- !GTK_WIDGET_VISIBLE (data->filter_combo), NULL);
+ taku_table_set_filter (TAKU_TABLE (data->launcher_table),
+ (TakuLauncherCategory *)g_list_nth_data (data->categories,
+ gtk_combo_box_get_active (widget)));
+}
- if (GTK_WIDGET_VISIBLE (data->search_entry)) {
+static void
+today_launcher_search_toggle_cb (MokoSearchBar *bar, gboolean search_visible,
+ TodayData *data)
+{
+ if (search_visible) {
/* Set the category to the created search category */
- taku_table_set_filter (TAKU_TABLE (data->launcher_table),
- data->search_cat);
- gtk_widget_grab_focus (data->search_entry);
+ today_launcher_filter_changed_cb (bar, GTK_EDITABLE (
+ moko_search_bar_get_entry (bar)), data);
} else {
/* Set the category back to the one pointed to by the
* drop-down.
*/
- taku_table_set_filter (TAKU_TABLE (data->launcher_table),
- (TakuLauncherCategory *)g_list_nth_data (
- data->categories, gtk_combo_box_get_active (
- GTK_COMBO_BOX (data->filter_combo))));
+ today_launcher_combo_changed_cb (bar,
+ moko_search_bar_get_combo_box (bar), data);
}
}
-static void
-today_launcher_combo_changed_cb (GtkComboBox *widget, TodayData *data)
-{
- taku_table_set_filter (TAKU_TABLE (data->launcher_table),
- (TakuLauncherCategory *)g_list_nth_data (data->categories,
- gtk_combo_box_get_active (widget)));
-}
-
GtkWidget *
today_launcher_page_create (TodayData *data)
{
@@ -314,20 +310,13 @@
gtk_box_pack_start (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
gtk_widget_show_all (toggle);
- data->search_entry = gtk_entry_new ();
- g_signal_connect (G_OBJECT (data->search_entry), "changed",
- G_CALLBACK (today_launcher_filter_changed_cb), data);
- gtk_widget_set_name (data->search_entry, "mokosearchentry");
- g_object_set (G_OBJECT (data->search_entry), "no-show-all", TRUE, NULL);
- gtk_box_pack_start (GTK_BOX (hbox), data->search_entry, TRUE, TRUE, 0);
-
data->filter_combo = gtk_combo_box_new_text ();
- gtk_box_pack_start (GTK_BOX (hbox), data->filter_combo, TRUE, TRUE, 0);
- gtk_widget_show (data->filter_combo);
+ data->search_bar = moko_search_bar_new_with_combo (
+ GTK_COMBO_BOX (data->filter_combo));
+ gtk_box_pack_start (GTK_BOX (main_vbox), data->search_bar,
+ FALSE, TRUE, 0);
+ gtk_widget_show (data->search_bar);
- gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, TRUE, 0);
- gtk_widget_show (hbox);
-
viewport = gtk_viewport_new (NULL, NULL);
gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport),
GTK_SHADOW_NONE);
@@ -365,9 +354,14 @@
GTK_COMBO_BOX (data->filter_combo), _("All"));
}
gtk_combo_box_set_active (GTK_COMBO_BOX (data->filter_combo), 0);
- g_signal_connect (G_OBJECT (data->filter_combo), "changed",
- G_CALLBACK (today_launcher_combo_changed_cb), data);
+ g_signal_connect (G_OBJECT (data->search_bar), "text_changed",
+ G_CALLBACK (today_launcher_filter_changed_cb), data);
+ g_signal_connect (G_OBJECT (data->search_bar), "combo_changed",
+ G_CALLBACK (today_launcher_combo_changed_cb), data);
+ g_signal_connect (G_OBJECT (data->search_bar), "toggled",
+ G_CALLBACK (today_launcher_search_toggle_cb), data);
+
/* Populate the task list */
/* TODO: Do this incrementally during idle time to increase
* start-up speed.
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today.h
2007-09-13 09:16:53 UTC (rev 2961)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today.h
2007-09-13 10:18:44 UTC (rev 2962)
@@ -34,8 +34,8 @@
/* App launcher */
GList *categories;
GtkWidget *launcher_table;
+ GtkWidget *search_bar;
GtkWidget *filter_combo;
- GtkWidget *search_entry;
TakuLauncherCategory *search_cat;
/* App manager */
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-09-13 12:29:36 +0200 (Thu, 13 Sep 2007)
New Revision: 2963
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
Log:
* Add a modeline to the ChangeLog to keep Chris happy
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-09-13 10:18:44 UTC (rev 2962)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-09-13 10:29:36 UTC (rev 2963)
@@ -513,3 +513,4 @@
Just use a GtkTreeView instead of the custom widget. Display events
within the next week from the main calendar. General UI shuffling.
+/* ex: set tabstop=8 expandtab: */
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-09-13 12:58:48 +0200 (Thu, 13 Sep 2007)
New Revision: 2964
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-keypad.c
Log:
* src/moko-dialer.c: (on_keypad_dial_clicked): Update status string
* src/moko-keypad.c: (on_dial_clicked): Close bug 814 - Number is
cleared when unable to dial
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-09-13 10:29:36 UTC (rev 2963)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-09-13 10:58:48 UTC (rev 2964)
@@ -1,8 +1,14 @@
2007-09-13 Thomas Wood <[EMAIL PROTECTED]>
- * src/moko-contacts.c: (moko_contacts_lookup): Protect against empty
number
- value. Should fix bug 819.
+ * src/moko-dialer.c: (on_keypad_dial_clicked): Update status string
+ * src/moko-keypad.c: (on_dial_clicked): Close bug 814 - Number is
+ cleared when unable to dial
+2007-09-13 Thomas Wood <[EMAIL PROTECTED]>
+
+ * src/moko-contacts.c: (moko_contacts_lookup): Protect against empty
+ number value. Should fix bug 819.
+
2007-09-09 Michael Lauer <[EMAIL PROTECTED]>
* src/moko-dialer.c: Fix typo and allow dialing when
@@ -858,3 +864,4 @@
(moko_dialer_get_default):
* src/moko-dialer.h:
Intial Import
+
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
2007-09-13 10:29:36 UTC (rev 2963)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
2007-09-13 10:58:48 UTC (rev 2964)
@@ -261,7 +261,7 @@
&& priv->registered != MOKO_GSMD_CONNECTION_NETREG_DENIED)
{
gchar *strings[] = {
- "No Status",
+ "None",
"Home network registered",
"Waiting for network registration",
"Network registration denied",
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-keypad.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-keypad.c
2007-09-13 10:29:36 UTC (rev 2963)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-keypad.c
2007-09-13 10:58:48 UTC (rev 2964)
@@ -157,7 +157,6 @@
else
g_signal_emit (G_OBJECT (keypad), keypad_signals[DIAL_NUMBER], 0, number);
- moko_dialer_textview_empty (MOKO_DIALER_TEXTVIEW (priv->textview));
}
static gboolean
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-09-13 18:28:25 +0200 (Thu, 13 Sep 2007)
New Revision: 2965
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer-main.c
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer-panel.c
Log:
* src/dialer-main.c: (main): Delay gtk+/mokostock initialisation unless really
required
* src/moko-dialer-panel.c: (moko_dialer_panel_class_init): Remove some extra
debug messages
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-09-13 10:58:48 UTC (rev 2964)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-09-13 16:28:25 UTC (rev 2965)
@@ -1,5 +1,12 @@
2007-09-13 Thomas Wood <[EMAIL PROTECTED]>
+ * src/dialer-main.c: (main): Delay gtk+/mokostock initialisation unless
+ really required
+ * src/moko-dialer-panel.c: (moko_dialer_panel_class_init): Remove some
+ extra debug messages
+
+2007-09-13 Thomas Wood <[EMAIL PROTECTED]>
+
* src/moko-dialer.c: (on_keypad_dial_clicked): Update status string
* src/moko-keypad.c: (on_dial_clicked): Close bug 814 - Number is
cleared when unable to dial
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer-main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer-main.c
2007-09-13 10:58:48 UTC (rev 2964)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer-main.c
2007-09-13 16:28:25 UTC (rev 2965)
@@ -130,9 +130,8 @@
g_option_context_free (context);
}
- /* Initialize Threading & GTK+ */
- gtk_init (&argc, &argv);
- moko_stock_register ();
+ /* initialise type system */
+ g_type_init ();
/* Try and setup our DBus service */
connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
@@ -154,16 +153,15 @@
/* Error requesting the name */
g_warning ("There was an error requesting the name: %s\n",error->message);
g_error_free (error);
-
- gdk_init(&argc, &argv);
+
+ gdk_init (&argc, &argv);
gdk_notify_startup_complete ();
return 1;
}
if (ret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER)
{
- /* Someone else hase registere dthe object */
- g_warning ("Another instance is running\n");
+ /* Someone else hase registered the object */
if (show_missed)
_show_missed (connection);
@@ -171,29 +169,20 @@
_dial_number (connection);
else
_show_dialer (connection);
-
+
dbus_g_connection_unref (connection);
-
- gdk_init(&argc, &argv);
+ gdk_init (&argc, &argv);
gdk_notify_startup_complete ();
return 0;
}
- /* So we are creating a new dialer, one of the first things we sould do is
- * resart gsmd, as we cannot guarentee it is running. This also solves the
- * problem of when it hangs.
- * FIXME: This shouldn't be left up to the dialer, and we cannot guarentee
- * to always have root access, but it'll work for most embedded devices.
- */
- /*
- g_debug ("(re)starting gsmd\n");
- g_spawn_command_line_sync ("/etc/init.d/gsmd stop",
- &out, &err, NULL, NULL);
- g_spawn_command_line_sync ("/etc/init.d/gsmd start",
- &out, &err, NULL, NULL);
- */
- /* Create the MokoDialer object */
+
+ /* Initialize Threading & GTK+ */
+ gtk_init (&argc, &argv);
+ moko_stock_register ();
+
+ /* Create the MokoDialer object */
dialer = moko_dialer_get_default ();
/* Add the object onto the bus */
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer-panel.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer-panel.c
2007-09-13 10:58:48 UTC (rev 2964)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer-panel.c
2007-09-13 16:28:25 UTC (rev 2965)
@@ -49,8 +49,6 @@
class->moko_dialer_panel_input = NULL;
class->moko_dialer_panel_hold = NULL;
- g_debug ("moko_dialer_panel:start signal register");
-
moko_dialer_panel_signals[CLICKED_SIGNAL] =
g_signal_new ("user_input",
G_OBJECT_CLASS_TYPE (object_class),
@@ -60,9 +58,6 @@
g_cclosure_marshal_VOID__CHAR, G_TYPE_NONE, 1,
g_type_from_name ("gchar"));
- g_debug ("moko_dialer_panel:signal register end,got the id :%d",
- moko_dialer_panel_signals[CLICKED_SIGNAL]);
-
moko_dialer_panel_signals[HOLD_SIGNAL] =
g_signal_new ("user_hold",
G_OBJECT_CLASS_TYPE (object_class),
@@ -72,9 +67,6 @@
g_cclosure_marshal_VOID__CHAR, G_TYPE_NONE, 1,
g_type_from_name ("gchar"));
- g_debug ("moko_dialer_panel:signal register end,got the id :%d",
- moko_dialer_panel_signals[HOLD_SIGNAL]);
-
}
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
