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. r2594 - in
trunk/src/target/OM-2007.2/applications/openmoko-today2: . src
([EMAIL PROTECTED])
2. r2595 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src
([EMAIL PROTECTED])
3. r2596 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src
([EMAIL PROTECTED])
4. r2597 - in
trunk/src/target/OM-2007.2/applications/openmoko-today2: .
libtaku src ([EMAIL PROTECTED])
5. r2598 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src
([EMAIL PROTECTED])
6. r2599 - in trunk/oe/packages/linux: . linux-gta01
([EMAIL PROTECTED])
--- Begin Message ---
Author: chris
Date: 2007-08-01 12:53:41 +0200 (Wed, 01 Aug 2007)
New Revision: 2594
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-task-manager.c
Log:
Send a WM delete event instead of destroying windows, fix raise app
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-08-01 00:20:35 UTC (rev 2593)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-08-01 10:53:41 UTC (rev 2594)
@@ -1,3 +1,13 @@
+2007-08-01 Chris Lord,,, <[EMAIL PROTECTED]>
+
+ * src/today-task-manager.c: (today_task_manager_populate_tasks),
+ (screen_changed_cb), (today_task_manager_kill),
+ (today_task_manager_kill_clicked_cb),
+ (today_task_manager_raise_clicked_cb),
+ (today_task_manager_killall_clicked_cb),
+ (today_task_manager_page_create):
+ Send a WM delete event instead of destroying windows, fix raise app
+
2007-07-31 Chris Lord,,, <[EMAIL PROTECTED]>
* src/today-task-manager.c: (today_task_manager_populate_tasks),
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-task-manager.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-task-manager.c
2007-08-01 00:20:35 UTC (rev 2593)
+++
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-task-manager.c
2007-08-01 10:53:41 UTC (rev 2594)
@@ -1,4 +1,5 @@
+#include <string.h>
#include <moko-stock.h>
#include <moko-finger-scroll.h>
#include <libtaku/taku-table.h>
@@ -21,6 +22,8 @@
_NET_WM_NAME,
_NET_WM_ICON,
_NET_WM_WINDOW_TYPE,
+ _NET_CLOSE_WINDOW,
+ _NET_ACTIVE_WINDOW,
N_ATOMS
};
@@ -374,9 +377,11 @@
GdkWindow *window;
if (GDK_WINDOW_XID (current) == windows[i]) continue;
+ if (GDK_WINDOW_XID (data->window->window) == windows[i])
+ continue;
- window = gdk_window_foreign_new_for_display (
- display, windows[i]);
+ if (!(window = gdk_window_foreign_new_for_display (
+ display, windows[i]))) continue;
if (gdk_window_get_type_hint (window) !=
GDK_WINDOW_TYPE_HINT_NORMAL) continue;
@@ -505,6 +510,12 @@
atoms[_NET_WM_WINDOW_TYPE] =
gdk_x11_get_xatom_by_name_for_display
(display, "_NET_WM_WINDOW_TYPE");
+ atoms[_NET_CLOSE_WINDOW] =
+ gdk_x11_get_xatom_by_name_for_display
+ (display, "_NET_CLOSE_WINDOW");
+ atoms[_NET_ACTIVE_WINDOW] =
+ gdk_x11_get_xatom_by_name_for_display
+ (display, "_NET_ACTIVE_WINDOW");
/* Get root window */
data->root_window = gdk_screen_get_root_window (screen);
@@ -545,6 +556,146 @@
return GDK_FILTER_CONTINUE;
}
+static void
+today_task_manager_kill (TodayData *data, GdkWindow *window)
+{
+ /* NOTE: See
+ * http://standards.freedesktop.org/wm-spec/wm-spec-1.3.html#id2506711
+ */
+ if (GDK_IS_WINDOW (window)) {
+ XEvent ev;
+ memset(&ev, 0, sizeof(ev));
+
+ ev.xclient.type = ClientMessage;
+ ev.xclient.window = GDK_WINDOW_XID (window);
+ ev.xclient.message_type = atoms[_NET_CLOSE_WINDOW];
+ ev.xclient.format = 32;
+ ev.xclient.data.l[0] = CurrentTime;
+ ev.xclient.data.l[1] = GDK_WINDOW_XID (data->root_window);
+
+ gdk_error_trap_push();
+ XSendEvent (GDK_WINDOW_XDISPLAY (window),
+ GDK_WINDOW_XID (data->root_window), False,
+ SubstructureRedirectMask, &ev);
+
+ XSync(GDK_DISPLAY(),FALSE);
+ gdk_error_trap_pop();
+
+ /* The following code looks equivalent to me, but isn't.. */
+ /*GdkEvent *event = gdk_event_new (GDK_CLIENT_EVENT);
+ ((GdkEventAny *)event)->window = g_object_ref (window);
+ ((GdkEventAny *)event)->send_event = TRUE;
+ ((GdkEventClient *)event)->message_type =
+ gdk_x11_xatom_to_atom (atoms[_NET_CLOSE_WINDOW]);
+ ((GdkEventClient *)event)->data_format = 32;
+ ((GdkEventClient *)event)->data.l[0] = GDK_CURRENT_TIME;
+ ((GdkEventClient *)event)->data.l[1] = GDK_WINDOW_XID (
+ data->root_window);
+
+ gdk_event_send_client_message (event,
+ GDK_WINDOW_XID (data->root_window));
+ gdk_event_free (event);*/
+ }
+}
+
+static void
+today_task_manager_kill_clicked_cb (GtkToolButton *widget, TodayData *data)
+{
+ GdkWindow *window;
+ GdkDisplay *display;
+ Window xid;
+ GtkWidget *tile = gtk_window_get_focus (GTK_WINDOW (data->window));
+
+ if (!TAKU_IS_ICON_TILE (tile)) return;
+
+ display = gtk_widget_get_display (data->tasks_table);
+ xid = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (tile), "window"));
+ window = gdk_window_foreign_new_for_display (display, xid);
+
+ today_task_manager_kill (data, window);
+}
+
+static void
+today_task_manager_raise_clicked_cb (GtkToolButton *widget, TodayData *data)
+{
+ XEvent ev;
+ GdkWindow *window;
+ GdkDisplay *display;
+ Window xid;
+ GtkWidget *tile = gtk_window_get_focus (GTK_WINDOW (data->window));
+
+ if (!TAKU_IS_ICON_TILE (tile)) return;
+
+ display = gtk_widget_get_display (data->tasks_table);
+ xid = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (tile), "window"));
+ window = gdk_window_foreign_new_for_display (display, xid);
+
+ g_debug ("Raising window");
+
+ /* NOTE: gdk_window_raise doesn't work? */
+ /*gdk_window_raise (window);*/
+
+ /* Send a _NET_ACTIVE_WINDOW message */
+ /* See
+ * http://standards.freedesktop.org/wm-spec/wm-spec-1.3.html#id2506353
+ */
+ memset(&ev, 0, sizeof(ev));
+
+ ev.xclient.type = ClientMessage;
+ ev.xclient.window = GDK_WINDOW_XID (window);
+ ev.xclient.message_type = atoms[_NET_ACTIVE_WINDOW];
+ ev.xclient.format = 32;
+ ev.xclient.data.l[0] = 1;
+ ev.xclient.data.l[1] = CurrentTime;
+ ev.xclient.data.l[2] = GDK_WINDOW_XID (data->root_window);
+
+ gdk_error_trap_push();
+ XSendEvent (GDK_WINDOW_XDISPLAY (window),
+ GDK_WINDOW_XID (data->root_window), False,
+ SubstructureRedirectMask, &ev);
+
+ XSync(GDK_DISPLAY(),FALSE);
+ gdk_error_trap_pop();
+}
+
+static void
+today_task_manager_killall_clicked_cb (GtkToolButton *widget, TodayData *data)
+{
+ GList *c, *children;
+ GdkDisplay *display;
+ GtkWidget *dialog;
+ gint response;
+
+ /* Confirmation dialog first */
+ dialog = gtk_message_dialog_new (GTK_WINDOW (data->window),
+ GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
+ "Are you sure you want to close all applications?");
+ response = gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+
+ if (response != GTK_RESPONSE_YES) return;
+
+ display = gtk_widget_get_display (data->tasks_table);
+
+ /* Kill all windows */
+ children = gtk_container_get_children (
+ GTK_CONTAINER (data->tasks_table));
+
+ for (c = children; c; c = c->next) {
+ GdkWindow *window;
+ Window xid;
+ GtkWidget *child = GTK_WIDGET (c->data);
+
+ if (!TAKU_IS_ICON_TILE (child)) continue;
+
+ xid = GPOINTER_TO_UINT (g_object_get_data (
+ G_OBJECT (child), "window"));
+ window = gdk_window_foreign_new_for_display (display, xid);
+
+ today_task_manager_kill (data, window);
+ }
+}
+
GtkWidget *
today_task_manager_page_create (TodayData *data)
{
@@ -562,16 +713,22 @@
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), button, 0);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar),
gtk_separator_tool_item_new (), 0);
+ g_signal_connect (G_OBJECT (button), "clicked",
+ G_CALLBACK (today_task_manager_killall_clicked_cb), data);
/* Kill app button */
button = today_toolbutton_new (GTK_STOCK_DELETE);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), button, 0);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar),
gtk_separator_tool_item_new (), 0);
+ g_signal_connect (G_OBJECT (button), "clicked",
+ G_CALLBACK (today_task_manager_kill_clicked_cb), data);
/* Switch to app button */
button = today_toolbutton_new (GTK_STOCK_JUMP_TO);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), button, 0);
+ g_signal_connect (G_OBJECT (button), "clicked",
+ G_CALLBACK (today_task_manager_raise_clicked_cb), data);
/* Viewport / tasks table */
viewport = gtk_viewport_new (NULL, NULL);
--- End Message ---
--- Begin Message ---
Author: njp
Date: 2007-08-01 13:20:39 +0200 (Wed, 01 Aug 2007)
New Revision: 2595
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
Log:
More debugging statements
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-08-01 10:53:41 UTC (rev 2594)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-08-01 11:20:39 UTC (rev 2595)
@@ -1,3 +1,8 @@
+2007-08-01 Neil J. Patel <[EMAIL PROTECTED]>
+
+ * src/moko-dialer.c: (register_network_cb):
+ Added some more debug statements.
+
2007-07-31 Neil J. Patel <[EMAIL PROTECTED]>
* src/moko-dialer.c: (on_call_progress_changed):
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-08-01 10:53:41 UTC (rev 2594)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
2007-08-01 11:20:39 UTC (rev 2595)
@@ -450,6 +450,7 @@
{
/* We have yet to request registration, so lets do it */
/* FIXME: do the pin stuff */
+ g_debug ("Requesting registration");
moko_gsmd_connection_network_register (priv->connection);
}
else
@@ -458,9 +459,15 @@
* gsmd
*/
if (priv->registered)
+ {
+ g_debug ("Netwok Registered");
return FALSE;
+ }
else
+ {
+ g_debug ("Requesting registration");
moko_gsmd_connection_network_register (priv->connection);
+ }
}
return TRUE;
--- End Message ---
--- Begin Message ---
Author: njp
Date: 2007-08-01 13:40:23 +0200 (Wed, 01 Aug 2007)
New Revision: 2596
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
Log:
2007-08-01 Neil J. Patel <[EMAIL PROTECTED]>
* src/moko-dialer.c: (moko_dialer_init):
Init some variables properly.
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-08-01 11:20:39 UTC (rev 2595)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-08-01 11:40:23 UTC (rev 2596)
@@ -1,4 +1,9 @@
2007-08-01 Neil J. Patel <[EMAIL PROTECTED]>
+
+ * src/moko-dialer.c: (moko_dialer_init):
+ Init some variables properly.
+
+2007-08-01 Neil J. Patel <[EMAIL PROTECTED]>
* src/moko-dialer.c: (register_network_cb):
Added some more debug statements.
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-08-01 11:20:39 UTC (rev 2595)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
2007-08-01 11:40:23 UTC (rev 2596)
@@ -579,7 +579,10 @@
conn = priv->connection = moko_gsmd_connection_new ();
moko_gsmd_connection_set_antenna_power (conn, TRUE);
- /* Handle network registration a few seconds after powering up the antenna*/
+ /* Handle network registration a few seconds after powering up the
+ * antenna*/
+ priv->reg_request = TRUE;
+ priv->registered = FALSE;
g_timeout_add (GSM_REGISTER_TIMEOUT,
(GSourceFunc)register_network_cb,
dialer);
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2007-08-01 13:53:49 +0200 (Wed, 01 Aug 2007)
New Revision: 2597
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/taku-launcher-tile.c
trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/taku-launcher-tile.h
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:
Implement application searching in the launcher
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-08-01 11:40:23 UTC (rev 2596)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-08-01 11:53:49 UTC (rev 2597)
@@ -1,5 +1,16 @@
2007-08-01 Chris Lord,,, <[EMAIL PROTECTED]>
+ * libtaku/taku-launcher-tile.c: (taku_launcher_tile_remove_group),
+ (taku_launcher_tile_get_groups):
+ * libtaku/taku-launcher-tile.h:
+ * src/today-launcher.c: (today_launcher_update_search),
+ (today_launcher_filter_changed_cb),
+ (today_launcher_search_toggle_cb), (today_launcher_page_create):
+ * src/today.h:
+ Implement application searching in the launcher
+
+2007-08-01 Chris Lord,,, <[EMAIL PROTECTED]>
+
* src/today-task-manager.c: (today_task_manager_populate_tasks),
(screen_changed_cb), (today_task_manager_kill),
(today_task_manager_kill_clicked_cb),
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/taku-launcher-tile.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/taku-launcher-tile.c
2007-08-01 11:40:23 UTC (rev 2596)
+++
trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/taku-launcher-tile.c
2007-08-01 11:53:49 UTC (rev 2597)
@@ -226,7 +226,22 @@
tile->priv->groups = g_list_prepend (tile->priv->groups, category);
}
+void
+taku_launcher_tile_remove_group (TakuLauncherTile *tile, TakuLauncherCategory
*category)
+{
+ g_return_if_fail (TAKU_IS_LAUNCHER_TILE (tile));
+ tile->priv->groups = g_list_remove (tile->priv->groups, category);
+}
+
+GList *
+taku_launcher_tile_get_groups (TakuLauncherTile *tile)
+{
+ g_return_val_if_fail (TAKU_IS_LAUNCHER_TILE (tile), NULL);
+
+ return g_list_copy (tile->priv->groups);
+}
+
TakuLauncherCategory *
taku_launcher_category_new (void)
{
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/taku-launcher-tile.h
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/taku-launcher-tile.h
2007-08-01 11:40:23 UTC (rev 2596)
+++
trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/taku-launcher-tile.h
2007-08-01 11:53:49 UTC (rev 2597)
@@ -75,6 +75,10 @@
void taku_launcher_tile_add_group (TakuLauncherTile *tile,
TakuLauncherCategory *category);
+void taku_launcher_tile_remove_group (TakuLauncherTile *tile,
TakuLauncherCategory *category);
+
+GList * taku_launcher_tile_get_groups (TakuLauncherTile *tile);
+
G_END_DECLS
#endif /* _TAKU_LAUNCHER_TILE */
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-08-01 11:40:23 UTC (rev 2596)
+++
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-launcher.c
2007-08-01 11:53:49 UTC (rev 2597)
@@ -191,6 +191,50 @@
}
static void
+today_launcher_update_search (TodayData *data, const gchar *search_string)
+{
+ GList *children, *c;
+
+ children = gtk_container_get_children (
+ GTK_CONTAINER (data->launcher_table));
+ for (c = children; c; c = c->next) {
+ gchar *name, *desc;
+ GtkWidget *tile = GTK_WIDGET (c->data);
+
+ if (!TAKU_IS_LAUNCHER_TILE (tile)) continue;
+
+ taku_launcher_tile_remove_group (TAKU_LAUNCHER_TILE (tile),
+ data->search_cat);
+ name = g_utf8_strup (taku_icon_tile_get_primary (
+ TAKU_ICON_TILE (tile)), -1);
+ desc = g_utf8_strup (taku_icon_tile_get_secondary (
+ TAKU_ICON_TILE (tile)), -1);
+ if (strstr (name, search_string) ||
+ strstr (desc, search_string)) {
+ taku_launcher_tile_add_group (TAKU_LAUNCHER_TILE (tile),
+ data->search_cat);
+ }
+ g_free (name);
+ g_free (desc);
+ }
+}
+
+static void
+today_launcher_filter_changed_cb (GtkEditable *editable, TodayData *data)
+{
+ gchar *search_string;
+
+ search_string = g_utf8_strup (gtk_entry_get_text (
+ GTK_ENTRY (editable)), -1);
+ today_launcher_update_search (data, search_string);
+ g_free (search_string);
+
+ /* Force the table to update */
+ taku_table_set_filter (TAKU_TABLE (data->launcher_table),
+ data->search_cat);
+}
+
+static void
today_launcher_search_toggle_cb (GtkWidget *button, TodayData *data)
{
g_object_set (G_OBJECT (data->search_entry), "visible",
@@ -200,10 +244,17 @@
if (GTK_WIDGET_VISIBLE (data->search_entry)) {
/* Set the category to the created search category */
+ taku_table_set_filter (TAKU_TABLE (data->launcher_table),
+ data->search_cat);
} 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))));
+ gtk_widget_grab_focus (data->search_entry);
}
}
@@ -239,6 +290,8 @@
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);
@@ -256,6 +309,12 @@
gtk_icon_size_register ("TakuIcon", 64, 64);
data->launcher_table = taku_table_new ();
+ /* Create search category */
+ data->search_cat = g_new0 (TakuLauncherCategory, 1);
+ data->search_cat->name = g_strdup ("Search");
+ data->search_cat->matches = g_new0 (gchar *, 2);
+ data->search_cat->matches[0] = g_strdup ("meta-search");
+
/* Load app categories */
vfolder_dir = g_build_filename (g_get_home_dir (),
".matchbox", "vfolders", NULL);
@@ -294,6 +353,9 @@
}
load_data_dir (g_get_user_data_dir (),
TAKU_TABLE (data->launcher_table), data->categories, NULL);
+
+ /* Make sure initial search shows all items */
+ today_launcher_update_search (data, "");
gtk_container_add (GTK_CONTAINER (viewport), data->launcher_table);
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-08-01 11:40:23 UTC (rev 2596)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today.h
2007-08-01 11:53:49 UTC (rev 2597)
@@ -14,8 +14,6 @@
GtkWidget *home_toolbar;
GtkWidget *message_box;
GtkWidget *summary_box;
- GtkWidget *filter_combo;
- GtkWidget *search_entry;
GtkToolItem *dial_button;
GtkToolItem *contacts_button;
GtkToolItem *messages_button;
@@ -26,6 +24,9 @@
/* App launcher */
GList *categories;
GtkWidget *launcher_table;
+ GtkWidget *filter_combo;
+ GtkWidget *search_entry;
+ TakuLauncherCategory *search_cat;
/* App manager */
GdkWindow *root_window;
--- End Message ---
--- Begin Message ---
Author: njp
Date: 2007-08-01 14:28:09 +0200 (Wed, 01 Aug 2007)
New Revision: 2598
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
Log:
2007-08-01 Neil J. Patel <[EMAIL PROTECTED]>
* src/moko-dialer.c: (on_pin_requested),
(on_call_progress_changed), (register_network_cb):
More debugging.
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-08-01 11:53:49 UTC (rev 2597)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-08-01 12:28:09 UTC (rev 2598)
@@ -1,5 +1,11 @@
2007-08-01 Neil J. Patel <[EMAIL PROTECTED]>
+ * src/moko-dialer.c: (on_pin_requested),
+ (on_call_progress_changed), (register_network_cb):
+ More debugging.
+
+2007-08-01 Neil J. Patel <[EMAIL PROTECTED]>
+
* src/moko-dialer.c: (moko_dialer_init):
Init some variables properly.
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-08-01 11:53:49 UTC (rev 2597)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
2007-08-01 12:28:09 UTC (rev 2598)
@@ -384,7 +384,7 @@
g_return_if_fail (MOKO_IS_DIALER (dialer));
priv = dialer->priv;
- g_debug ("Incoming pin request for type %d", type);
+ g_print ("Incoming pin request for type %d", type);
}
@@ -397,44 +397,44 @@
g_return_if_fail (MOKO_IS_DIALER (dialer));
priv = dialer->priv;
- g_debug ("mokogsmd call progress changed");
+ g_print ("mokogsmd call progress changed");
switch (type)
{
case MOKO_GSMD_PROG_DISCONNECT:
case MOKO_GSMD_PROG_RELEASE:
moko_dialer_hung_up (dialer);
moko_keypad_set_talking (MOKO_KEYPAD (priv->keypad), FALSE);
- g_debug ("mokogsmd disconnect");
+ g_print ("mokogsmd disconnect");
break;
case MOKO_GSMD_PROG_REJECT:
moko_dialer_rejected (dialer);
moko_keypad_set_talking (MOKO_KEYPAD (priv->keypad), FALSE);
- g_debug ("mokogsmd reject");
+ g_print ("mokogsmd reject");
break;
case MOKO_GSMD_PROG_CONNECTED:
moko_keypad_set_talking (MOKO_KEYPAD (priv->keypad), TRUE);
- g_debug ("mokogsmd connected");
+ g_print ("mokogsmd connected");
break;
case MOKO_GSMD_PROG_SETUP:
- g_debug ("mokogsmd setup");
+ g_print ("mokogsmd setup");
break;
case MOKO_GSMD_PROG_ALERT:
- g_debug ("mokogsmd alert");
+ g_print ("mokogsmd alert");
break;
case MOKO_GSMD_PROG_CALL_PROCEED:
- g_debug ("mokogsmd proceed");
+ g_print ("mokogsmd proceed");
break;
case MOKO_GSMD_PROG_SYNC:
- g_debug ("mokogsmd sync");
+ g_print ("mokogsmd sync");
break;
case MOKO_GSMD_PROG_PROGRESS:
- g_debug ("mokogsmd progress");
+ g_print ("mokogsmd progress");
break;
case MOKO_GSMD_PROG_UNKNOWN:
default:
- g_debug ("mokogsmd unknown");
+ g_print ("mokogsmd unknown");
break;
}
}
@@ -450,7 +450,7 @@
{
/* We have yet to request registration, so lets do it */
/* FIXME: do the pin stuff */
- g_debug ("Requesting registration");
+ g_print ("Requesting registration");
moko_gsmd_connection_network_register (priv->connection);
}
else
@@ -460,12 +460,12 @@
*/
if (priv->registered)
{
- g_debug ("Netwok Registered");
+ g_print ("Netwok Registered");
return FALSE;
}
else
{
- g_debug ("Requesting registration");
+ g_print ("Requesting registration");
moko_gsmd_connection_network_register (priv->connection);
}
}
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-08-01 18:10:27 +0200 (Wed, 01 Aug 2007)
New Revision: 2599
Modified:
trunk/oe/packages/linux/linux-gta01/defconfig-2.6.21.6-fic-gta01
trunk/oe/packages/linux/linux-gta01_2.6.21.6.bb
Log:
* add PCF50633 and GLAMO support to make this kernel work on GTA02
* bump mokoversion to moko11
Modified: trunk/oe/packages/linux/linux-gta01/defconfig-2.6.21.6-fic-gta01
===================================================================
--- trunk/oe/packages/linux/linux-gta01/defconfig-2.6.21.6-fic-gta01
2007-08-01 12:28:09 UTC (rev 2598)
+++ trunk/oe/packages/linux/linux-gta01/defconfig-2.6.21.6-fic-gta01
2007-08-01 16:10:27 UTC (rev 2599)
@@ -33,7 +33,7 @@
#
# General setup
#
-CONFIG_LOCALVERSION="-moko10"
+CONFIG_LOCALVERSION="-moko11"
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
@@ -187,7 +187,7 @@
# CONFIG_MACH_NEXCODER_2440 is not set
CONFIG_SMDK2440_CPU2440=y
CONFIG_MACH_HXD8=y
-# CONFIG_MACH_NEO1973_GTA02 is not set
+CONFIG_MACH_NEO1973_GTA02=y
#
# S3C2442 Machines
@@ -1032,7 +1032,7 @@
# CONFIG_SENSORS_DS1374 is not set
# CONFIG_SENSORS_EEPROM is not set
CONFIG_SENSORS_PCF50606=y
-# CONFIG_SENSORS_PCF50633 is not set
+CONFIG_SENSORS_PCF50633=y
# CONFIG_SENSORS_PCF8574 is not set
# CONFIG_SENSORS_PCA9539 is not set
# CONFIG_SENSORS_PCF8591 is not set
@@ -1180,7 +1180,10 @@
# CONFIG_FB_S1D13XXX is not set
CONFIG_FB_S3C2410=y
CONFIG_FB_S3C2410_DEBUG=y
-# CONFIG_FB_GLAMO is not set
+CONFIG_GLAMO=y
+CONFIG_FB_GLAMO=y
+CONFIG_GLAMO_SPI_GPIO=y
+CONFIG_FB_GLAMO_SPI=y
# CONFIG_FB_VIRTUAL is not set
#
Modified: trunk/oe/packages/linux/linux-gta01_2.6.21.6.bb
===================================================================
--- trunk/oe/packages/linux/linux-gta01_2.6.21.6.bb 2007-08-01 12:28:09 UTC
(rev 2598)
+++ trunk/oe/packages/linux/linux-gta01_2.6.21.6.bb 2007-08-01 16:10:27 UTC
(rev 2599)
@@ -3,7 +3,7 @@
SRC_URI +=
"svn://svn.openmoko.org/trunk/src/target/kernel;module=patches;proto=http"
SRC_URI += "file://fix-EVIOCGRAB-semantics.patch;patch=1"
-MOKOR = "moko10"
+MOKOR = "moko11"
PR = "${MOKOR}-r1"
VANILLA_VERSION = "2.6.21.6"
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
