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. r2780 - in trunk/src/target/OM-2007.2/libraries: libmokogsmd2
libmokogsmd2/libmokogsmd libmokojournal2
libmokojournal2/mokojournal libmokoui2 libmokoui2/libmokoui
([EMAIL PROTECTED])
2. r2781 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src
([EMAIL PROTECTED])
3. r2782 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src
([EMAIL PROTECTED])
4. r2783 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src
([EMAIL PROTECTED])
--- Begin Message ---
Author: zecke
Date: 2007-08-22 16:36:56 +0200 (Wed, 22 Aug 2007)
New Revision: 2780
Modified:
trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog
trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.h
trunk/src/target/OM-2007.2/libraries/libmokojournal2/ChangeLog
trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.c
trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.h
trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.h
Log:
libmokogsmd2:
2007-08-22 Holger Freyther <[EMAIL PROTECTED]>
Rubberstamped by Mickey.
Change the hethat way.ader to help h2def.py find GObjects. Please keep
this that way.
* libmokogsmd/moko-gsmd-connection.h:
libmokojournal2:
2007-08-22 Holger Freyther <[EMAIL PROTECTED]>
Rubberstamped by Mickey.
Change the hethat way.ader to help h2def.py find GObjects. Please keep
this that way.
Use a typedef for the enum's just like Gtk+ and Pango.
* mokojournal/moko-journal.c:
(entry_type_to_string):
(moko_journal_entry_type_is_valid):
(moko_journal_entry_to_icalcomponent):
(icalcomponent_to_entry):
(moko_journal_entry_new):
(moko_journal_entry_set_type):
(moko_journal_entry_get_direction):
(moko_journal_entry_set_direction):
* mokojournal/moko-journal.h:
libmokoui2:
2007-08-22 Holger Freyther <[EMAIL PROTECTED]>
Rubberstamped by Mickey.
Change the hethat way.ader to help h2def.py find GObjects. Please keep
this that way.
* libmokoui/moko-finger-scroll.h:
Modified: trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog 2007-08-22
14:24:30 UTC (rev 2779)
+++ trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog 2007-08-22
14:36:56 UTC (rev 2780)
@@ -1,3 +1,12 @@
+2007-08-22 Holger Freyther <[EMAIL PROTECTED]>
+
+ Rubberstamped by Mickey.
+
+ Change the hethat way.ader to help h2def.py find GObjects. Please keep
+ this that way.
+
+ * libmokogsmd/moko-gsmd-connection.h:
+
2007-08-20 Daniel Willmann <[EMAIL PROTECTED]>
* libmokogsmd/moko-gsmd-connection.c:
Modified:
trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.h
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.h
2007-08-22 14:24:30 UTC (rev 2779)
+++
trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.h
2007-08-22 14:36:56 UTC (rev 2780)
@@ -23,29 +23,20 @@
G_BEGIN_DECLS
#define MOKO_TYPE_GSMD_CONNECTION moko_gsmd_connection_get_type()
-
-#define MOKO_GSMD_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- MOKO_TYPE_GSMD_CONNECTION, MokoGsmdConnection))
-
-#define MOKO_GSMD_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \
- MOKO_TYPE_GSMD_CONNECTION, MokoGsmdConnectionClass))
-
-#define MOKO_IS_GSMD_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
- MOKO_TYPE_GSMD_CONNECTION))
-
-#define MOKO_IS_GSMD_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE
((klass),\
- MOKO_TYPE_GSMD_CONNECTION))
-
+#define MOKO_GSMD_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
MOKO_TYPE_GSMD_CONNECTION, MokoGsmdConnection))
+#define MOKO_GSMD_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
MOKO_TYPE_GSMD_CONNECTION, MokoGsmdConnectionClass))
+#define MOKO_IS_GSMD_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
MOKO_TYPE_GSMD_CONNECTION))
+#define MOKO_IS_GSMD_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE
((klass), MOKO_TYPE_GSMD_CONNECTION))
#define MOKO_GSMD_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
MOKO_TYPE_GSMD_CONNECTION, MokoGsmdConnectionClass))
-typedef struct
-{
+typedef struct _MokoGsmdConnection MokoGsmdConnection;
+typedef struct _MokoGsmdConnectionClass MokoGsmdConnectionClass;
+
+struct _MokoGsmdConnection {
GObject parent;
+};
-} MokoGsmdConnection;
-
-typedef struct
-{
+struct _MokoGsmdConnectionClass {
GObjectClass parent_class;
/* Voice signals */
@@ -72,9 +63,9 @@
void (*_moko_gsmdconn_3) (void);
void (*_moko_gsmdconn_4) (void);
-} MokoGsmdConnectionClass;
+};
-enum
+typedef enum
{
MOKO_GSMD_CONNECTION_NETREG_NONE = 0,
MOKO_GSMD_CONNECTION_NETREG_HOME = 1,
@@ -85,7 +76,7 @@
} MokoGsmdConnectionNetregType;
-enum
+typedef enum
{
MOKO_GSMD_PROG_SETUP = 0,
MOKO_GSMD_PROG_DISCONNECT = 1,
Modified: trunk/src/target/OM-2007.2/libraries/libmokojournal2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokojournal2/ChangeLog
2007-08-22 14:24:30 UTC (rev 2779)
+++ trunk/src/target/OM-2007.2/libraries/libmokojournal2/ChangeLog
2007-08-22 14:36:56 UTC (rev 2780)
@@ -1,3 +1,23 @@
+2007-08-22 Holger Freyther <[EMAIL PROTECTED]>
+
+ Rubberstamped by Mickey.
+
+ Change the hethat way.ader to help h2def.py find GObjects. Please keep
+ this that way.
+
+ Use a typedef for the enum's just like Gtk+ and Pango.
+
+ * mokojournal/moko-journal.c:
+ (entry_type_to_string):
+ (moko_journal_entry_type_is_valid):
+ (moko_journal_entry_to_icalcomponent):
+ (icalcomponent_to_entry):
+ (moko_journal_entry_new):
+ (moko_journal_entry_set_type):
+ (moko_journal_entry_get_direction):
+ (moko_journal_entry_set_direction):
+ * mokojournal/moko-journal.h:
+
2007-08-13 Neil J. Patel <[EMAIL PROTECTED]>
* Makefile.am:
Modified:
trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.c
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.c
2007-08-22 14:24:30 UTC (rev 2779)
+++
trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.c
2007-08-22 14:36:56 UTC (rev 2780)
@@ -81,11 +81,11 @@
struct _MokoJournalEntry
{
- enum MokoJournalEntryType type;
+ MokoJournalEntryType type;
gchar *uid ;
gchar *contact_uid ;
gchar *summary ;
- enum MessageDirection direction ;
+ MessageDirection direction ;
MokoTime *dtstart ;
MokoTime *dtend ;
float start_longitude ;
@@ -107,7 +107,7 @@
struct _MokoJournalEntryInfo
{
- enum MokoJournalEntryType type;
+ MokoJournalEntryType type;
const gchar *type_as_string ;
};
typedef struct _MokoJournalEntryInfo MokoJournalEntryInfo ;
@@ -148,10 +148,10 @@
const gchar *a_uid,
MokoJournalEntry **a_entry,
int *a_offset) ;
-static const gchar* entry_type_to_string (enum MokoJournalEntryType a_type) ;
-static enum MokoJournalEntryType entry_type_from_string (const gchar* a_str) ;
+static const gchar* entry_type_to_string (MokoJournalEntryType a_type) ;
+static MokoJournalEntryType entry_type_from_string (const gchar* a_str) ;
static gboolean moko_journal_entry_type_is_valid
- (enum MokoJournalEntryType a_type) ;
+ (MokoJournalEntryType a_type) ;
static gboolean moko_journal_entry_to_icalcomponent (MokoJournalEntry *a_entry,
icalcomponent **a_comp) ;
static gboolean icalcomponent_to_entry (icalcomponent *a_comp,
@@ -256,7 +256,7 @@
}
static const gchar*
-entry_type_to_string (enum MokoJournalEntryType a_type)
+entry_type_to_string (MokoJournalEntryType a_type)
{
MokoJournalEntryInfo *cur ;
@@ -268,7 +268,7 @@
return NULL ;
}
-static enum MokoJournalEntryType
+static MokoJournalEntryType
entry_type_from_string (const gchar* a_str)
{
MokoJournalEntryInfo *cur ;
@@ -582,7 +582,7 @@
}
static gboolean
-moko_journal_entry_type_is_valid (enum MokoJournalEntryType a_type)
+moko_journal_entry_type_is_valid (MokoJournalEntryType a_type)
{
if (a_type > 0 && a_type < NB_OF_ENTRY_TYPES)
return TRUE ;
@@ -597,7 +597,7 @@
icalproperty *prop = NULL ;
gboolean result = FALSE ;
gchar *str=NULL ;
- enum MessageDirection dir = DIRECTION_IN ;
+ MessageDirection dir = DIRECTION_IN ;
g_return_val_if_fail (a_entry, FALSE) ;
g_return_val_if_fail (a_comp, FALSE) ;
@@ -770,7 +770,7 @@
if (icalcomponent_find_property_as_string (a_comp, "X-OPENMOKO-ENTRY-TYPE",
&prop_value))
{
- enum MokoJournalEntryType entry_type = UNDEF_ENTRY ;
+ MokoJournalEntryType entry_type = UNDEF_ENTRY ;
if (!prop_value)
{
g_warning ("could not get entry type") ;
@@ -1580,7 +1580,7 @@
* Return value: the newly created journal entry object
*/
MokoJournalEntry*
-moko_journal_entry_new (enum MokoJournalEntryType a_type)
+moko_journal_entry_new (MokoJournalEntryType a_type)
{
MokoJournalEntry *result ;
result = moko_journal_entry_alloc () ;
@@ -1596,7 +1596,7 @@
*
* Return value: the type of the journal entry
*/
-enum MokoJournalEntryType
+MokoJournalEntryType
moko_journal_entry_get_entry_type (MokoJournalEntry *a_entry)
{
g_return_val_if_fail (a_entry, UNDEF_ENTRY) ;
@@ -1614,7 +1614,7 @@
*/
void
moko_journal_entry_set_type (MokoJournalEntry *a_entry,
- enum MokoJournalEntryType a_type)
+ MokoJournalEntryType a_type)
{
g_return_if_fail (a_entry) ;
g_return_if_fail (a_type != UNDEF_ENTRY) ;
@@ -1794,7 +1794,7 @@
*/
gboolean
moko_journal_entry_get_direction (MokoJournalEntry *a_entry,
- enum MessageDirection *a_direction)
+ MessageDirection *a_direction)
{
g_return_val_if_fail (a_entry, FALSE) ;
g_return_val_if_fail (a_direction, FALSE) ;
@@ -1812,7 +1812,7 @@
*
*/
void moko_journal_entry_set_direction (MokoJournalEntry *a_entry,
- enum MessageDirection direction)
+ MessageDirection direction)
{
g_return_if_fail (a_entry) ;
Modified:
trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.h
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.h
2007-08-22 14:24:30 UTC (rev 2779)
+++
trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.h
2007-08-22 14:36:56 UTC (rev 2780)
@@ -19,7 +19,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __MOKO_JOURNAL_H__
-#define __MOKO_JOURNAL_H__
+#define __MOKO_JOURNAL_H__
#include <glib.h>
#include <glib-object.h>
@@ -66,7 +66,7 @@
* this represents the primary type of
* a journal entry.
*/
-enum MokoJournalEntryType {
+typedef enum {
UNDEF_ENTRY=0,
EMAIL_JOURNAL_ENTRY,
/*sms calls*/
@@ -78,12 +78,12 @@
/*data calls (like modems)*/
DATA_JOURNAL_ENTRY,
NB_OF_ENTRY_TYPES /*must always be the last*/
-} ;
+} MokoJournalEntryType ;
-enum MessageDirection {
+typedef enum {
DIRECTION_IN=0,
DIRECTION_OUT
-};
+} MessageDirection ;
typedef struct
{
@@ -221,7 +221,7 @@
*
* Return value: the newly created journal entry object
*/
-MokoJournalEntry* moko_journal_entry_new (enum MokoJournalEntryType type) ;
+MokoJournalEntry* moko_journal_entry_new (MokoJournalEntryType type) ;
/**
* moko_journal_entry_get_entry_type:
@@ -231,7 +231,7 @@
*
* Return value: the type of the journal entry
*/
-enum MokoJournalEntryType moko_journal_entry_get_entry_type (MokoJournalEntry
*entry);
+MokoJournalEntryType moko_journal_entry_get_entry_type (MokoJournalEntry
*entry);
/**
* moko_journal_entry_set_type:
@@ -241,7 +241,7 @@
* Set the type of the journal entry
*/
void moko_journal_entry_set_type (MokoJournalEntry *entry,
- enum MokoJournalEntryType type) ;
+ MokoJournalEntryType type) ;
/**
* moko_journal_entry_get_uid:
@@ -338,7 +338,7 @@
* Returns: TRUE in case of success, FALSE otherwise.
*/
gboolean moko_journal_entry_get_direction (MokoJournalEntry *entry,
- enum MessageDirection *direction) ;
+ MessageDirection *direction) ;
/**
* moko_journal_entry_set_direction:
@@ -349,7 +349,7 @@
*
*/
void moko_journal_entry_set_direction (MokoJournalEntry *entry,
- enum MessageDirection direction) ;
+ MessageDirection direction) ;
/**
* moko_journal_entry_get_dtdstart:
Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog 2007-08-22
14:24:30 UTC (rev 2779)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog 2007-08-22
14:36:56 UTC (rev 2780)
@@ -1,3 +1,12 @@
+2007-08-22 Holger Freyther <[EMAIL PROTECTED]>
+
+ Rubberstamped by Mickey.
+
+ Change the hethat way.ader to help h2def.py find GObjects. Please keep
+ this that way.
+
+ * libmokoui/moko-finger-scroll.h:
+
2007-08-15 Thomas Wood <[EMAIL PROTECTED]>
* libmokoui/moko-stock.c: (_moko_stock_add_icon): Add a hack to make
sure we
Modified:
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.h
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.h
2007-08-22 14:24:30 UTC (rev 2779)
+++
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.h
2007-08-22 14:36:56 UTC (rev 2780)
@@ -26,34 +26,22 @@
G_BEGIN_DECLS
#define MOKO_TYPE_FINGER_SCROLL moko_finger_scroll_get_type()
+#define MOKO_FINGER_SCROLL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
MOKO_TYPE_FINGER_SCROLL, MokoFingerScroll))
+#define MOKO_FINGER_SCROLL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
MOKO_TYPE_FINGER_SCROLL, MokoFingerScrollClass))
+#define MOKO_IS_FINGER_SCROLL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
MOKO_TYPE_FINGER_SCROLL))
+#define MOKO_IS_FINGER_SCROLL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
MOKO_TYPE_FINGER_SCROLL))
+#define MOKO_FINGER_SCROLL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
MOKO_TYPE_FINGER_SCROLL, MokoFingerScrollClass))
-#define MOKO_FINGER_SCROLL(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- MOKO_TYPE_FINGER_SCROLL, MokoFingerScroll))
+typedef struct _MokoFingerScroll MokoFingerScroll;
+typedef struct _MokoFingerScrollClass MokoFingerScrollClass;
-#define MOKO_FINGER_SCROLL_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST ((klass), \
- MOKO_TYPE_FINGER_SCROLL, MokoFingerScrollClass))
-
-#define MOKO_IS_FINGER_SCROLL(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
- MOKO_TYPE_FINGER_SCROLL))
-
-#define MOKO_IS_FINGER_SCROLL_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE ((klass), \
- MOKO_TYPE_FINGER_SCROLL))
-
-#define MOKO_FINGER_SCROLL_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), \
- MOKO_TYPE_FINGER_SCROLL, MokoFingerScrollClass))
-
-typedef struct {
+struct _MokoFingerScroll {
GtkEventBox parent;
-} MokoFingerScroll;
+};
-typedef struct {
+struct _MokoFingerScrollClass {
GtkEventBoxClass parent_class;
-} MokoFingerScrollClass;
+};
typedef enum {
MOKO_FINGER_SCROLL_MODE_PUSH,
--- End Message ---
--- Begin Message ---
Author: njp
Date: 2007-08-22 16:41:02 +0200 (Wed, 22 Aug 2007)
New Revision: 2781
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-talking.c
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.h
Log:
2007-08-22 Neil J. Patel <[EMAIL PROTECTED]>
* src/moko-dialer.c: (on_talking_silence), (moko_dialer_init):
* src/moko-talking.c: (on_silence_clicked),
(moko_talking_class_init), (moko_talking_init):
* src/moko-talking.h:
Add 'silence/ignore' capability to incoming calls i.e. stop the ringing
and
vibration, but don't hangup.
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-08-22 14:36:56 UTC (rev 2780)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-08-22 14:41:02 UTC (rev 2781)
@@ -1,5 +1,14 @@
2007-08-22 Neil J. Patel <[EMAIL PROTECTED]>
+ * src/moko-dialer.c: (on_talking_silence), (moko_dialer_init):
+ * src/moko-talking.c: (on_silence_clicked),
+ (moko_talking_class_init), (moko_talking_init):
+ * src/moko-talking.h:
+ Add 'silence/ignore' capability to incoming calls i.e. stop the ringing
and
+ vibration, but don't hangup.
+
+2007-08-22 Neil J. Patel <[EMAIL PROTECTED]>
+
* src/moko-contacts.c: (moko_contacts_fuzzy_lookup):
* src/moko-notify.c: (moko_notify_check_brightness):
Remove some unnecessary printf's.
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-22 14:36:56 UTC (rev 2780)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
2007-08-22 14:41:02 UTC (rev 2781)
@@ -384,6 +384,19 @@
}
static void
+on_talking_silence (MokoTalking *talking, MokoDialer *dialer)
+{
+ MokoDialerPrivate *priv;
+
+ g_return_if_fail (MOKO_IS_DIALER (dialer));
+ priv = dialer->priv;
+
+ priv->status = DIALER_STATUS_NORMAL;
+
+ moko_notify_stop (priv->notify);
+}
+
+static void
on_talking_speaker_toggle (MokoTalking *talking,
gboolean speaker_phone,
MokoDialer *dialer)
@@ -810,6 +823,8 @@
G_CALLBACK (on_talking_reject_call), (gpointer)dialer);
g_signal_connect (G_OBJECT (priv->talking), "cancel_call",
G_CALLBACK (on_talking_cancel_call), (gpointer)dialer);
+ g_signal_connect (G_OBJECT (priv->talking), "silence",
+ G_CALLBACK (on_talking_silence), (gpointer)dialer);
g_signal_connect (G_OBJECT (priv->talking), "speaker_toggle",
G_CALLBACK (on_talking_speaker_toggle), (gpointer)dialer);
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c
2007-08-22 14:36:56 UTC (rev 2780)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c
2007-08-22 14:41:02 UTC (rev 2781)
@@ -56,6 +56,7 @@
ACCEPT_CALL = 0,
REJECT_CALL,
CANCEL_CALL,
+ SILENCE,
SPEAKER_TOGGLE,
LAST_SIGNAL
@@ -265,6 +266,13 @@
}
static void
+on_silence_clicked (GtkToolButton *button, MokoTalking *talking)
+{
+ g_source_remove (talking->priv->timeout);
+ g_signal_emit (G_OBJECT (talking), talking_signals[SILENCE], 0);
+}
+
+static void
on_cancel_clicked (GtkToolButton *button, MokoTalking *talking)
{
g_source_remove (talking->priv->timeout);
@@ -327,6 +335,14 @@
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
+ talking_signals[SILENCE] =
+ g_signal_new ("silence",
+ G_TYPE_FROM_CLASS (obj_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (MokoTalkingClass, silence),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
talking_signals[SPEAKER_TOGGLE] =
g_signal_new ("speaker_toggle",
@@ -366,6 +382,18 @@
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), gtk_separator_tool_item_new (),
1);
+ image = gtk_image_new_from_stock (GTK_STOCK_MEDIA_PAUSE,
+ GTK_ICON_SIZE_LARGE_TOOLBAR);
+ item = gtk_tool_button_new (image, "Reject");
+ gtk_widget_show_all (GTK_WIDGET (item));
+ gtk_tool_item_set_expand (item, TRUE);
+ g_signal_connect (G_OBJECT (item), "clicked",
+ G_CALLBACK (on_silence_clicked), (gpointer)talking);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, 2);
+
+
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), gtk_separator_tool_item_new (),
3);
+
icon = gdk_pixbuf_new_from_file (PKGDATADIR"/cancel.png", NULL);
image = gtk_image_new_from_pixbuf (icon);
item = gtk_tool_button_new (image, "Reject");
@@ -373,8 +401,7 @@
gtk_tool_item_set_expand (item, TRUE);
g_signal_connect (G_OBJECT (item), "clicked",
G_CALLBACK (on_reject_clicked), (gpointer)talking);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, 2);
-
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, 4);
/* Outgoing call and talking share the same toolbar */
priv->main_bar = toolbar = gtk_toolbar_new ();
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.h
2007-08-22 14:36:56 UTC (rev 2780)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.h
2007-08-22 14:41:02 UTC (rev 2781)
@@ -65,6 +65,7 @@
void (*accept_call) (MokoTalking *talking);
void (*reject_call) (MokoTalking *talking);
void (*cancel_call) (MokoTalking *talking);
+ void (*silence) (MokoTalking *talking);
void (*speaker_toggle) (MokoTalking *talking, gboolean speaker_phone);
};
--- End Message ---
--- Begin Message ---
Author: njp
Date: 2007-08-22 16:44:32 +0200 (Wed, 22 Aug 2007)
New Revision: 2782
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-22 Neil J. Patel <[EMAIL PROTECTED]>
* src/moko-dialer.c: (on_network_registered):
Correctly format output.
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-08-22 14:41:02 UTC (rev 2781)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-08-22 14:44:32 UTC (rev 2782)
@@ -1,5 +1,10 @@
2007-08-22 Neil J. Patel <[EMAIL PROTECTED]>
+ * src/moko-dialer.c: (on_network_registered):
+ Correctly format output.
+
+2007-08-22 Neil J. Patel <[EMAIL PROTECTED]>
+
* src/moko-dialer.c: (on_talking_silence), (moko_dialer_init):
* src/moko-talking.c: (on_silence_clicked),
(moko_talking_class_init), (moko_talking_init):
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-22 14:41:02 UTC (rev 2781)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
2007-08-22 14:44:32 UTC (rev 2782)
@@ -450,7 +450,7 @@
case MOKO_GSMD_CONNECTION_NETREG_HOME:
case MOKO_GSMD_CONNECTION_NETREG_ROAMING:
g_print ("NetReg: Network registered\n");
- g_print("\tLocationAreaCode = %x\n\tCellID = %x", lac, cell);
+ g_print("\tLocationAreaCode = %x\n\tCellID = %x\n", lac, cell);
g_source_remove (priv->reg_timeout);
priv->registered = TRUE;
break;
--- End Message ---
--- Begin Message ---
Author: njp
Date: 2007-08-22 16:56:52 +0200 (Wed, 22 Aug 2007)
New Revision: 2783
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-22 Neil J. Patel <[EMAIL PROTECTED]>
* src/moko-dialer.c: (on_talking_reject_call),
(on_talking_cancel_call), (on_talking_silence):
Make sure function ordering is correct so multiple tabs do not open.
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-08-22 14:44:32 UTC (rev 2782)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-08-22 14:56:52 UTC (rev 2783)
@@ -1,5 +1,11 @@
2007-08-22 Neil J. Patel <[EMAIL PROTECTED]>
+ * src/moko-dialer.c: (on_talking_reject_call),
+ (on_talking_cancel_call), (on_talking_silence):
+ Make sure function ordering is correct so multiple tabs do not open.
+
+2007-08-22 Neil J. Patel <[EMAIL PROTECTED]>
+
* src/moko-dialer.c: (on_network_registered):
Correctly format output.
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-22 14:44:32 UTC (rev 2782)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
2007-08-22 14:56:52 UTC (rev 2783)
@@ -347,8 +347,11 @@
g_return_if_fail (MOKO_IS_DIALER (dialer));
priv = dialer->priv;
+ moko_gsmd_connection_voice_hangup (priv->connection);
priv->status = DIALER_STATUS_NORMAL;
-
+
+ gtk_notebook_remove_page (GTK_NOTEBOOK (priv->notebook), 0);
+
/* Finalise and add the journal entry */
if (priv->entry)
{
@@ -359,9 +362,6 @@
priv->time = NULL;
}
- gtk_notebook_remove_page (GTK_NOTEBOOK (priv->notebook), 0);
- moko_gsmd_connection_voice_hangup (priv->connection);
-
g_signal_emit (G_OBJECT (dialer), dialer_signals[REJECTED], 0);
moko_keypad_set_talking (MOKO_KEYPAD (priv->keypad), FALSE);
}
@@ -373,12 +373,12 @@
g_return_if_fail (MOKO_IS_DIALER (dialer));
priv = dialer->priv;
-
+
+ moko_gsmd_connection_voice_hangup (priv->connection);
+
priv->status = DIALER_STATUS_NORMAL;
-
gtk_notebook_remove_page (GTK_NOTEBOOK (priv->notebook), 0);
- moko_gsmd_connection_voice_hangup (priv->connection);
-
+
g_signal_emit (G_OBJECT (dialer), dialer_signals[HUNG_UP], 0);
moko_keypad_set_talking (MOKO_KEYPAD (priv->keypad), FALSE);
}
@@ -391,8 +391,6 @@
g_return_if_fail (MOKO_IS_DIALER (dialer));
priv = dialer->priv;
- priv->status = DIALER_STATUS_NORMAL;
-
moko_notify_stop (priv->notify);
}
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
