r3526 - in trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . data src/phone-kit
thomas at sita.openmoko.org
thomas at sita.openmoko.org
Wed Nov 28 13:47:13 CET 2007
Author: thomas
Date: 2007-11-28 13:47:04 +0100 (Wed, 28 Nov 2007)
New Revision: 3526
Added:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/moko-call-answer.png
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/moko-call-hangup.png
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/moko-call-hold.png
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/moko-call-ignore.png
Removed:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/answer.png
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/cancel.png
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/delete.png
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/delete_01.png
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/redial.png
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/Makefile.am
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/dialer-main.c
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
Log:
* data/Makefile.am:
* src/phone-kit/dialer-main.c: (main):
* src/phone-kit/moko-talking.c: (moko_talking_init):
MokoStock seems to be unreliable, so include and load images ourselves
for now
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog 2007-11-28 12:06:44 UTC (rev 3525)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog 2007-11-28 12:47:04 UTC (rev 3526)
@@ -1,5 +1,14 @@
2007-11-28 Thomas Wood <thomas at openedhand.com>
+ * data/Makefile.am:
+ * src/phone-kit/dialer-main.c: (main):
+ * src/phone-kit/moko-talking.c: (moko_talking_init):
+
+ MokoStock seems to be unreliable, so include and load images ourselves
+ for now
+
+2007-11-28 Thomas Wood <thomas at openedhand.com>
+
* src/phone-kit/moko-dialer.c: (dialer_init_gsmd):
- Add back PIN handler registration
- Correct error handling from lgsm_phone_power
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/Makefile.am 2007-11-28 12:06:44 UTC (rev 3525)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/Makefile.am 2007-11-28 12:47:04 UTC (rev 3526)
@@ -8,17 +8,12 @@
speaker.png\
email.png\
phone.png\
- delete.png\
dtmf.png\
talking.png\
sms.png\
all.png\
history.png\
- delete_01.png\
- answer.png\
- cancel.png\
hangup.png\
- redial.png\
failure.png\
incoming_0.png\
incoming_1.png\
@@ -34,7 +29,12 @@
talking_3.png\
exit.png\
connecting.png\
- incall.png
+ incall.png \
+ moko-call-answer.png \
+ moko-call-hangup.png \
+ moko-call-hold.png \
+ moko-call-ignore.png
+
#
# desktop integration: .desktop file
#
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/answer.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/cancel.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/delete.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/delete_01.png
===================================================================
(Binary files differ)
Added: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/moko-call-answer.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/moko-call-answer.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/moko-call-hangup.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/moko-call-hangup.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/moko-call-hold.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/moko-call-hold.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/moko-call-ignore.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/moko-call-ignore.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/redial.png
===================================================================
(Binary files differ)
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/dialer-main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/dialer-main.c 2007-11-28 12:06:44 UTC (rev 3525)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/dialer-main.c 2007-11-28 12:47:04 UTC (rev 3526)
@@ -20,8 +20,6 @@
#include <dbus/dbus-glib-bindings.h>
#include <glib-object.h>
-#include <moko-stock.h>
-
#include "moko-dialer.h"
#define DIALER_NAMESPACE "org.openmoko.Dialer"
@@ -105,7 +103,6 @@
/* Initialize Threading & GTK+ */
gtk_init (&argc, &argv);
- moko_stock_register ();
/* Create the MokoDialer object */
dialer = moko_dialer_get_default ();
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-28 12:06:44 UTC (rev 3525)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c 2007-11-28 12:47:04 UTC (rev 3526)
@@ -19,8 +19,6 @@
#include <gtk/gtk.h>
-#include <moko-stock.h>
-
#include "moko-sound.h"
#include "moko-talking.h"
#include "moko-dialer-panel.h"
@@ -495,21 +493,21 @@
priv->incoming_bar = toolbar = gtk_toolbar_new ();
gtk_box_pack_start (GTK_BOX (main_vbox), toolbar, FALSE, FALSE, 0);
- item = gtk_tool_button_new_from_stock (MOKO_STOCK_CALL_ANSWER);
+ item = gtk_tool_button_new (gtk_image_new_from_file (PKGDATADIR"/moko-call-answer.png"), NULL);
gtk_tool_item_set_expand (item, TRUE);
g_signal_connect (item, "clicked", G_CALLBACK (on_answer_clicked), talking);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, 0);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), gtk_separator_tool_item_new (), 1);
- item = gtk_tool_button_new_from_stock (MOKO_STOCK_CALL_IGNORE);
+ item = gtk_tool_button_new (gtk_image_new_from_file (PKGDATADIR"/moko-call-ignore.png"), NULL);
gtk_tool_item_set_expand (item, TRUE);
g_signal_connect (item, "clicked", G_CALLBACK (on_silence_clicked), talking);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, 2);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), gtk_separator_tool_item_new (), 3);
- item = gtk_tool_button_new_from_stock (MOKO_STOCK_CALL_REJECT);
+ item = gtk_tool_button_new (gtk_image_new_from_file (PKGDATADIR"/moko-call-hangup.png"), NULL);
gtk_tool_item_set_expand (item, TRUE);
g_signal_connect (item, "clicked", G_CALLBACK (on_reject_clicked), talking);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, 4);
@@ -518,7 +516,10 @@
priv->main_bar = toolbar = gtk_toolbar_new ();
gtk_box_pack_start (GTK_BOX (main_vbox), toolbar, FALSE, FALSE, 0);
- item = gtk_toggle_tool_button_new_from_stock (MOKO_STOCK_SPEAKER);
+ item = gtk_toggle_tool_button_new ();
+ gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (item),
+ gtk_image_new_from_file (PKGDATADIR"/speaker.png"));
+
gtk_tool_item_set_expand (item, TRUE);
g_signal_connect (item, "toggled", G_CALLBACK (on_speaker_toggled), talking);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, 0);
@@ -526,7 +527,7 @@
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), gtk_separator_tool_item_new (), 1);
- item = gtk_tool_button_new_from_stock (MOKO_STOCK_CALL_HANGUP);
+ item = gtk_tool_button_new (gtk_image_new_from_file (PKGDATADIR"/moko-call-hangup.png"), NULL);
gtk_tool_item_set_expand (item, TRUE);
g_signal_connect (item, "clicked", G_CALLBACK (on_cancel_clicked), talking);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, 2);
More information about the commitlog
mailing list
