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. r3317 - trunk/src/host/qemu-neo1973/hw ([EMAIL PROTECTED])
2. r3318 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: .
src/phone-kit ([EMAIL PROTECTED])
3. r3319 -
trunk/src/target/OM-2007.2/misc/openmoko-today2-folders
([EMAIL PROTECTED])
4. r3320 - in
trunk/src/target/OM-2007.2/applications/openmoko-worldclock2: .
src ([EMAIL PROTECTED])
5. r3321 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: .
src/dialer ([EMAIL PROTECTED])
6. r3322 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . data
([EMAIL PROTECTED])
--- Begin Message ---
Author: andrew
Date: 2007-11-01 12:40:32 +0100 (Thu, 01 Nov 2007)
New Revision: 3317
Modified:
trunk/src/host/qemu-neo1973/hw/neo1973.c
Log:
Update neo1973 board init to new boot_devices handling.
Modified: trunk/src/host/qemu-neo1973/hw/neo1973.c
===================================================================
--- trunk/src/host/qemu-neo1973/hw/neo1973.c 2007-11-01 11:27:59 UTC (rev
3316)
+++ trunk/src/host/qemu-neo1973/hw/neo1973.c 2007-11-01 11:40:32 UTC (rev
3317)
@@ -415,7 +415,7 @@
};
/* Board init. */
-static void neo_init(int ram_size, int vga_ram_size, int boot_device,
+static void neo_init(int ram_size, int vga_ram_size, const char *boot_device,
DisplayState *ds, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-11-01 13:19:43 +0100 (Thu, 01 Nov 2007)
New Revision: 3318
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
Log:
* src/phone-kit/moko-talking.c:
Revert use of GdkPixbufSimpleAnim as it does not support looping
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-11-01 11:40:32 UTC (rev 3317)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-11-01 12:19:43 UTC (rev 3318)
@@ -1,3 +1,8 @@
+2007-11-01 Thomas Wood <[EMAIL PROTECTED]>
+
+ * src/phone-kit/moko-talking.c:
+ Revert use of GdkPixbufSimpleAnim as it does not support looping
+
2007-10-31 Thomas Wood <[EMAIL PROTECTED]>
* src/phone-kit/moko-talking.c: Replace manual animation functions with
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
2007-11-01 11:40:32 UTC (rev 3317)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
2007-11-01 12:19:43 UTC (rev 3318)
@@ -48,9 +48,9 @@
GtkWidget *person;
GtkWidget *status;
- GdkPixbufSimpleAnim *talking_anim;
- GdkPixbufSimpleAnim *incoming_anim;
- GdkPixbufSimpleAnim *outgoing_anim;
+ GdkPixbuf *talking[N_PICS];
+ GdkPixbuf *incoming[4];
+ GdkPixbuf *outgoing[4];
GTimer *dtimer;
guint timeout;
@@ -100,6 +100,25 @@
g_free (markup);
}
+static gboolean
+incoming_timeout (MokoTalking *talking)
+{
+ MokoTalkingPrivate *priv;
+ static gint i = 0;
+
+ g_return_val_if_fail (MOKO_IS_TALKING (talking), FALSE);
+ priv = talking->priv;
+
+ gtk_image_set_from_pixbuf (GTK_IMAGE (priv->icon),
+ priv->incoming[i]);
+
+ i++;
+ if (i == 4)
+ i = 0;
+
+ return TRUE;
+}
+
void
moko_talking_incoming_call (MokoTalking *talking,
const gchar *number,
@@ -115,14 +134,39 @@
gtk_label_set_text (GTK_LABEL (priv->title), "Incoming Call");
gtk_label_set_text (GTK_LABEL (priv->duration), "");
- gtk_image_set_from_animation (GTK_IMAGE (priv->icon), priv->incoming_anim);
+ gtk_image_set_from_file (GTK_IMAGE (priv->icon),
+ PKGDATADIR"/incoming_3.png");
gtk_label_set_text (GTK_LABEL (priv->status), number);
gtk_image_set_from_file (GTK_IMAGE (priv->person),
PKGDATADIR"/unkown.png");
+ if (priv->timeout)
+ g_source_remove (priv->timeout);
+ priv->timeout = g_timeout_add (1000,
+ (GSourceFunc)incoming_timeout,
+ (gpointer)talking);
gtk_window_present (GTK_WINDOW (priv->window));
}
+static gboolean
+outgoing_timeout (MokoTalking *talking)
+{
+ MokoTalkingPrivate *priv;
+ static gint i = 0;
+
+ g_return_val_if_fail (MOKO_IS_TALKING (talking), FALSE);
+ priv = talking->priv;
+
+ gtk_image_set_from_pixbuf (GTK_IMAGE (priv->icon),
+ priv->outgoing[i]);
+
+ i++;
+ if (i == 4)
+ i = 0;
+
+ return TRUE;
+}
+
void
moko_talking_outgoing_call (MokoTalking *talking,
const gchar *number,
@@ -146,7 +190,6 @@
gtk_label_set_text (GTK_LABEL (priv->title), "Outgoing Call");
gtk_label_set_text (GTK_LABEL (priv->duration), "");
- gtk_image_set_from_animation (GTK_IMAGE (priv->icon), priv->outgoing_anim);
gtk_label_set_markup (GTK_LABEL (priv->status), markup);
@@ -155,6 +198,12 @@
else
gtk_image_set_from_file (GTK_IMAGE (priv->person),
PKGDATADIR"/unkown.png");
+ if (priv->timeout)
+ g_source_remove (priv->timeout);
+ priv->timeout = g_timeout_add (1000,
+ (GSourceFunc)outgoing_timeout,
+ (gpointer)talking);
+
g_free (markup);
gtk_window_present (GTK_WINDOW (priv->window));
}
@@ -165,7 +214,8 @@
MokoTalkingPrivate *priv;
gdouble elapsed;
gint hour, min, sec;
- gchar *text = NULL;
+ gchar *markup = NULL;
+ static gint i = 0;
g_return_val_if_fail (MOKO_IS_TALKING (talking), FALSE);
priv = talking->priv;
@@ -178,11 +228,18 @@
min = (gint) ((elapsed - 3600 * hour) / 60);
sec = (gint) (elapsed - 3600 * hour - 60 * min);
- text = g_strdup_printf ("%02d:%02d:%02d", hour, min, sec);
- gtk_label_set_text (GTK_LABEL (priv->duration), text);
- g_free(text);
+ markup = g_strdup_printf ("%02d:%02d:%02d", hour, min, sec);
+ gtk_label_set_markup (GTK_LABEL (priv->duration), markup);
}
+ gtk_image_set_from_pixbuf (GTK_IMAGE (priv->icon),
+ priv->talking[i]);
+
+ i++;
+ if (i == 5)
+ i = 0;
+
+ g_free(markup);
return TRUE;
}
@@ -209,7 +266,8 @@
gtk_label_set_text (GTK_LABEL (priv->title), "Talking");
gtk_label_set_text (GTK_LABEL (priv->duration), "00:00:00");
- gtk_image_set_from_animation (GTK_IMAGE (priv->icon), priv->talking_anim);
+ gtk_image_set_from_file (GTK_IMAGE (priv->icon),
+ PKGDATADIR"/talking_3.png");
/* start call duration timer */
if (priv->dtimer)
@@ -427,36 +485,38 @@
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
/* Load the pixbufs */
- priv->talking_anim = gdk_pixbuf_simple_anim_new (96, 96, 1);
- gdk_pixbuf_simple_anim_add_frame (priv->talking_anim,
- gdk_pixbuf_new_from_file (PKGDATADIR"/talking_0.png", NULL));
- gdk_pixbuf_simple_anim_add_frame (priv->talking_anim,
- gdk_pixbuf_new_from_file (PKGDATADIR"/talking_1.png", NULL));
- gdk_pixbuf_simple_anim_add_frame (priv->talking_anim,
- gdk_pixbuf_new_from_file (PKGDATADIR"/talking_2.png", NULL));
- gdk_pixbuf_simple_anim_add_frame (priv->talking_anim,
- gdk_pixbuf_new_from_file (PKGDATADIR"/talking_3.png", NULL));
+ for (i = 0; i < N_PICS; i++)
+ {
+ if (i == 0)
+ priv->talking[i] = gdk_pixbuf_new_from_file (PKGDATADIR"/talking.png",
+ NULL);
+ else
+ {
+ gchar *name = g_strdup_printf ("%s/talking_%d.png", PKGDATADIR, i-1);
+ priv->talking[i] = gdk_pixbuf_new_from_file (name, NULL);
+ g_free (name);
+ }
+ if (G_IS_OBJECT (priv->talking[i]))
+ g_object_ref (priv->talking[i]);
+ }
+ for (i = 0; i < N_PICS-1; i++)
+ {
+ gchar *name = g_strdup_printf ("%s/outgoing_%d.png", PKGDATADIR, i);
+ priv->outgoing[i] = gdk_pixbuf_new_from_file (name, NULL);
+ g_free (name);
+ if (G_IS_OBJECT (priv->outgoing[i]))
+ g_object_ref (priv->outgoing[i]);
+ }
+ for (i = 0; i < N_PICS-1; i++)
+ {
+ gchar *name = g_strdup_printf ("%s/incoming_%d.png", PKGDATADIR, i);
+ priv->incoming[i] = gdk_pixbuf_new_from_file (name, NULL);
+ g_free (name);
+ if (G_IS_OBJECT (priv->incoming[i]))
+ g_object_ref (priv->incoming[i]);
- priv->incoming_anim = gdk_pixbuf_simple_anim_new (96, 96, 1);
- gdk_pixbuf_simple_anim_add_frame (priv->incoming_anim,
- gdk_pixbuf_new_from_file (PKGDATADIR"/incoming_0.png", NULL));
- gdk_pixbuf_simple_anim_add_frame (priv->incoming_anim,
- gdk_pixbuf_new_from_file (PKGDATADIR"/incoming_1.png", NULL));
- gdk_pixbuf_simple_anim_add_frame (priv->incoming_anim,
- gdk_pixbuf_new_from_file (PKGDATADIR"/incoming_2.png", NULL));
- gdk_pixbuf_simple_anim_add_frame (priv->incoming_anim,
- gdk_pixbuf_new_from_file (PKGDATADIR"/incoming_3.png", NULL));
+ }
- priv->outgoing_anim = gdk_pixbuf_simple_anim_new (96, 96, 1);
- gdk_pixbuf_simple_anim_add_frame (priv->outgoing_anim,
- gdk_pixbuf_new_from_file (PKGDATADIR"/outgoing_0.png", NULL));
- gdk_pixbuf_simple_anim_add_frame (priv->outgoing_anim,
- gdk_pixbuf_new_from_file (PKGDATADIR"/outgoing_1.png", NULL));
- gdk_pixbuf_simple_anim_add_frame (priv->outgoing_anim,
- gdk_pixbuf_new_from_file (PKGDATADIR"/outgoing_2.png", NULL));
- gdk_pixbuf_simple_anim_add_frame (priv->outgoing_anim,
- gdk_pixbuf_new_from_file (PKGDATADIR"/outgoing_3.png", NULL));
-
priv->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_widget_show_all (main_vbox);
gtk_container_add (GTK_CONTAINER (priv->window), main_vbox);
--- End Message ---
--- Begin Message ---
Author: stefan
Date: 2007-11-01 13:34:11 +0100 (Thu, 01 Nov 2007)
New Revision: 3319
Modified:
trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/ChangeLog
trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/Makefile.am
Log:
2007-11-01 Stefan Schmidt <[EMAIL PROTECTED]>
Make sure PIM.directory gets installed. Thanks Ross Burton for
spotting.
* Makefile.am:
Modified: trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/ChangeLog
2007-11-01 12:19:43 UTC (rev 3318)
+++ trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/ChangeLog
2007-11-01 12:34:11 UTC (rev 3319)
@@ -1,3 +1,9 @@
+2007-11-01 Stefan Schmidt <[EMAIL PROTECTED]>
+
+ Make sure PIM.directory gets installed. Thanks Ross Burton for
spotting.
+
+ * Makefile.am:
+
2007-08-10 Stefan Schmidt <[EMAIL PROTECTED]>
Change order for the filter menu and add a PIM category.
Modified: trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/Makefile.am
2007-11-01 12:19:43 UTC (rev 3318)
+++ trunk/src/target/OM-2007.2/misc/openmoko-today2-folders/Makefile.am
2007-11-01 12:34:11 UTC (rev 3319)
@@ -4,5 +4,6 @@
All.directory \
Applications.directory \
Games.directory \
+ PIM.directory \
Settings.directory \
Utilities.directory
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2007-11-01 17:21:18 +0100 (Thu, 01 Nov 2007)
New Revision: 3320
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/src/worldclock-main.c
Log:
* src/worldclock-main.c: (map_button_press_event_cb), (main):
Use a static map and add code to find the nearest timezone to where the
user clicks
Modified: trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/ChangeLog
2007-11-01 12:34:11 UTC (rev 3319)
+++ trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/ChangeLog
2007-11-01 16:21:18 UTC (rev 3320)
@@ -1,3 +1,9 @@
+2007-11-01 Chris Lord <[EMAIL PROTECTED]>
+
+ * src/worldclock-main.c: (map_button_press_event_cb), (main):
+ Use a static map and add code to find the nearest timezone to where the
+ user clicks
+
2007-10-31 Chris Lord <[EMAIL PROTECTED]>
* configure.ac:
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/src/worldclock-main.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/src/worldclock-main.c
2007-11-01 12:34:11 UTC (rev 3319)
+++
trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/src/worldclock-main.c
2007-11-01 16:21:18 UTC (rev 3320)
@@ -24,6 +24,7 @@
#include <libmokoui2/moko-finger-scroll.h>
#include <time.h>
#include <sys/time.h>
+#include <math.h>
#include "worldclock-data.h"
#define GCONF_POKY_INTERFACE_PREFIX "/desktop/poky/interface"
@@ -268,11 +269,36 @@
map_button_press_event_cb (JanaGtkWorldMap *map, GdkEventButton *event,
WorldClockData *data)
{
- gdouble lat, lon;
+ GList *markers, *m;
+ gdouble lat, lon, old_distance;
+ JanaGtkWorldMapMarker *marker;
jana_gtk_world_map_get_latlon (map, event->x, event->y, &lat, &lon);
- g_message ("Map clicked at latitude, longitude: %lg, %lg", lat, lon);
+ markers = jana_gtk_world_map_get_markers (map);
+ marker = NULL;
+ old_distance = G_MAXDOUBLE;
+ for (m = markers; m; m = m->next) {
+ gdouble distance;
+ JanaGtkWorldMapMarker *marker2 =
+ (JanaGtkWorldMapMarker *)m->data;
+
+ distance = sqrt (pow (marker2->lat - lat, 2) +
+ pow (marker2->lon - lon, 2));
+ if (distance < old_distance) {
+ marker = marker2;
+ old_distance = distance;
+ }
+ }
+
+ if (marker) {
+ WorldClockZoneData *tzdata = (WorldClockZoneData *)
+ g_object_get_data (G_OBJECT (marker), "zone");
+ g_debug ("Nearest location: %s", tzdata->name);
+ }
+
+ g_list_free (markers);
+
return FALSE;
}
@@ -320,6 +346,9 @@
/* Create scrolling map */
data.map = jana_gtk_world_map_new ();
+ jana_gtk_world_map_set_width (JANA_GTK_WORLD_MAP (data.map), 2048);
+ jana_gtk_world_map_set_height (JANA_GTK_WORLD_MAP (data.map), 1024);
+ jana_gtk_world_map_set_static (JANA_GTK_WORLD_MAP (data.map), TRUE);
add_marks (&data);
gtk_widget_add_events (GTK_WIDGET (data.map), GDK_BUTTON_PRESS_MASK);
g_signal_connect (data.map, "button-press-event",
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-11-01 17:36:13 +0100 (Thu, 01 Nov 2007)
New Revision: 3321
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/dialer-main.c
Log:
* src/dialer/dialer-main.c: Use dbus service to initiate calls
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-11-01 16:21:18 UTC (rev 3320)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-11-01 16:36:13 UTC (rev 3321)
@@ -1,5 +1,9 @@
2007-11-01 Thomas Wood <[EMAIL PROTECTED]>
+ * src/dialer/dialer-main.c: Use dbus service to initiate calls
+
+2007-11-01 Thomas Wood <[EMAIL PROTECTED]>
+
* src/phone-kit/moko-talking.c:
Revert use of GdkPixbufSimpleAnim as it does not support looping
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/dialer-main.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/dialer-main.c
2007-11-01 16:21:18 UTC (rev 3320)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/dialer-main.c
2007-11-01 16:36:13 UTC (rev 3321)
@@ -24,134 +24,63 @@
// #include "moko-dialer.h"
#include "moko-keypad.h"
+#include "moko-history.h"
-static gboolean show_dialer;
static gboolean show_missed;
-static gchar *number = NULL;
static GOptionEntry entries[] = {
- {"show-dialer", 's', 0, G_OPTION_ARG_NONE, &show_dialer,
- "Show the dialer at startup", "N"},
{"show-missed", 'm', 0, G_OPTION_ARG_NONE, &show_missed,
"Show the history window filtered by the missed, none.", "N"},
-
- {"dial", 'd', 0, G_OPTION_ARG_STRING, &number,
- "Dial the specified number.", "N"},
{NULL}
};
/* Callbacks from widgets */
-#if 0
static void
on_keypad_dial_clicked (MokoKeypad *keypad,
const gchar *number,
- MokoDialer *dialer)
+ DBusGProxy *proxy)
{
- GtkWidget *dlg;
- MokoDialerPrivate *priv;
- MokoContactEntry *entry = NULL;
-
- g_return_if_fail (MOKO_IS_DIALER (dialer));
- priv = dialer->priv;
+ GError *error = NULL;
- if (!number) {
+ if (!number)
+ {
+ /*
gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), 1);
moko_history_set_filter (MOKO_HISTORY (priv->history),
HISTORY_FILTER_DIALED);
+ */
return;
}
- /* check current dialer state */
- if (0 || priv->status != DIALER_STATUS_NORMAL)
- {
- gchar *strings[] = {
- "Normal",
- "Incoming Call",
- "Dialing",
- "Outgoing Call"
- };
- dlg = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
- "Cannot dial when dialer is busy.\nCurrent status = %s",
strings[priv->status]);
- gtk_dialog_run (GTK_DIALOG (dlg));
- gtk_widget_destroy (dlg);
+ g_debug ("Dial %s", number);
- g_warning ("Cannot dial when dialer is busy: %d\n", priv->status);
+ dbus_g_proxy_call (proxy, "Dial", &error, G_TYPE_STRING, number,
G_TYPE_INVALID, G_TYPE_INVALID);
- return;
- }
- priv->status = DIALER_STATUS_DIALING;
-
- /* check for network connection */
- if (priv->registered != MOKO_GSMD_CONNECTION_NETREG_HOME
- && priv->registered != MOKO_GSMD_CONNECTION_NETREG_ROAMING
- && priv->registered != MOKO_GSMD_CONNECTION_NETREG_DENIED)
+ if (error)
{
- gchar *strings[] = {
- "None",
- "Home network registered",
- "Searching for network",
- "Network registration denied",
- "",
- "Roaming network registered"
- };
-
- dlg = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
- "Cannot dial number. %s", strings[priv->registered]);
- gtk_dialog_run (GTK_DIALOG (dlg));
- gtk_widget_destroy (dlg);
-
- /* no point continuing if we're not connected to a network! */
- priv->status = DIALER_STATUS_NORMAL;
- return;
+ g_warning (error->message);
}
-
- entry = moko_contacts_lookup (moko_contacts_get_default (), number);
-
- /* Prepare a voice journal entry */
- if (priv->journal)
+ else
{
- priv->entry = moko_journal_entry_new (VOICE_JOURNAL_ENTRY);
- moko_journal_entry_set_direction (priv->entry, DIRECTION_OUT);
- moko_journal_entry_set_source (priv->entry, "Openmoko Dialer");
- moko_journal_entry_set_gsm_location (priv->entry, &priv->gsm_location);
- moko_journal_voice_info_set_distant_number (priv->entry, number);
- if (entry && entry->contact->uid)
- moko_journal_entry_set_contact_uid (priv->entry, entry->contact->uid);
+ /* the dbus object takes over now */
+ gtk_main_quit();
}
- moko_talking_outgoing_call (MOKO_TALKING (priv->talking), number, entry);
-
- gtk_notebook_insert_page (GTK_NOTEBOOK (priv->notebook), priv->talking,
- gtk_image_new_from_file (PKGDATADIR"/phone.png"),
- 0);
- gtk_container_child_set (GTK_CONTAINER (priv->notebook), priv->talking,
- "tab-expand", TRUE,
- NULL);
-
- gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), 0);
-
- gtk_window_present (GTK_WINDOW (priv->window));
-
- moko_keypad_set_talking (MOKO_KEYPAD (priv->keypad), TRUE);
-
- moko_gsmd_connection_voice_dial (priv->connection, number);
-
- g_signal_emit (G_OBJECT (dialer), dialer_signals[OUTGOING_CALL], 0, number);
}
static void
on_history_dial_number (MokoHistory *history,
const gchar *number,
- MokoDialer *dialer)
+ DBusGProxy *proxy)
{
- on_keypad_dial_clicked (NULL, number, dialer);
+ on_keypad_dial_clicked (NULL, number, proxy);
}
-
-#endif
int main (int argc, char **argv)
{
+ GtkWidget *window, *notebook, *keypad, *history;
+ MokoJournal *journal;
if (argc != 1)
{
@@ -172,14 +101,71 @@
moko_stock_register ();
+ DBusGConnection *connection;
+ GError *error;
+ DBusGProxy *proxy;
+
+ g_type_init ();
+
+ error = NULL;
+ connection = dbus_g_bus_get (DBUS_BUS_SESSION,
+ &error);
+ if (connection == NULL)
+ {
+ g_printerr ("Failed to open connection to bus: %s\n",
+ error->message);
+ g_error_free (error);
+ exit (1);
+ }
+
+ proxy = dbus_g_proxy_new_for_name (connection, "org.openmoko.Dialer",
"/org/openmoko/Dialer", "org.openmoko.Dialer");
+
/* application object */
g_set_application_name ("OpenMoko Dialer");
-#if 0
+
+ /* Set up the journal */
+ journal = moko_journal_open_default ();
+ if (!journal || !moko_journal_load_from_storage (journal))
+ {
+ g_warning ("Could not load journal");
+ journal = NULL;
+ }
+
+
+ window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ g_signal_connect (G_OBJECT (window), "delete-event",
+ (GCallback) gtk_widget_hide_on_delete, NULL);
+ gtk_window_set_title (GTK_WINDOW (window), "Dialer");
+
+ /* Notebook */
+ notebook = gtk_notebook_new ();
+ gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook), GTK_POS_BOTTOM);
+ gtk_container_add (GTK_CONTAINER (window), notebook);
+
+
+ /* Keypad */
+ keypad = moko_keypad_new ();
+ g_signal_connect (keypad, "dial_number", G_CALLBACK
(on_keypad_dial_clicked), proxy);
+
+ gtk_notebook_append_page (GTK_NOTEBOOK (notebook), keypad,
gtk_image_new_from_file (PKGDATADIR"/dtmf.png"));
+ gtk_container_child_set (GTK_CONTAINER (notebook), keypad, "tab-expand",
TRUE, NULL);
+
+ /* History */
+ history = moko_history_new (journal);
+ g_signal_connect (history, "dial_number", G_CALLBACK
(on_history_dial_number), proxy);
+ gtk_notebook_append_page (GTK_NOTEBOOK (notebook), history,
+ gtk_image_new_from_stock (MOKO_STOCK_CALL_HISTORY,
+ GTK_ICON_SIZE_BUTTON));
+ gtk_container_child_set (GTK_CONTAINER (notebook), history,
+ "tab-expand", TRUE,
+ NULL);
+
+ gtk_widget_show_all (window);
if (show_missed)
- moko_dialer_show_missed_calls (dialer, NULL);
- else if (show_dialer)
- moko_dialer_show_dialer (dialer, NULL);
-#endif
+ gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), 1);
+ else
+ gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), 0);
+
gtk_main ();
return 0;
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-11-01 17:45:13 +0100 (Thu, 01 Nov 2007)
New Revision: 3322
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/org.openmoko.Dialer.service.in
Log:
* data/org.openmoko.Dialer.service.in: Update binary name
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-11-01 16:36:13 UTC (rev 3321)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-11-01 16:45:13 UTC (rev 3322)
@@ -1,5 +1,9 @@
2007-11-01 Thomas Wood <[EMAIL PROTECTED]>
+ * data/org.openmoko.Dialer.service.in: Update binary name
+
+2007-11-01 Thomas Wood <[EMAIL PROTECTED]>
+
* src/dialer/dialer-main.c: Use dbus service to initiate calls
2007-11-01 Thomas Wood <[EMAIL PROTECTED]>
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/org.openmoko.Dialer.service.in
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/org.openmoko.Dialer.service.in
2007-11-01 16:36:13 UTC (rev 3321)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/org.openmoko.Dialer.service.in
2007-11-01 16:45:13 UTC (rev 3322)
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.openmoko.Dialer
[EMAIL PROTECTED]@/openmoko-dialer
[EMAIL PROTECTED]@/phone-kit
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
