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. r4336 - trunk/src/target/OM-2007.2/daemons/neod/src
([EMAIL PROTECTED])
2. r4337 -
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit
([EMAIL PROTECTED])
3. r4338 -
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0
([EMAIL PROTECTED])
4. r4339 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: .
src/dialer ([EMAIL PROTECTED])
5. r4340 - in
trunk/src/target/OM-2007.2/applications/openmoko-messages2: . src
([EMAIL PROTECTED])
6. r4341 - trunk/src/target/opkg/libopkg ([EMAIL PROTECTED])
--- Begin Message ---
Author: sean_chiang
Date: 2008-04-10 12:37:21 +0200 (Thu, 10 Apr 2008)
New Revision: 4336
Modified:
trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
Log:
when headset in or out, send signal to dbus
Modified: trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2008-04-10
06:30:54 UTC (rev 4335)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2008-04-10
10:37:21 UTC (rev 4336)
@@ -85,6 +85,26 @@
#define BIT_TEST( bitmask, bit ) \
( bitmask[ (bit) / sizeof(short) / 8 ] & (1u << ( (bit) % (sizeof(short) *
8))) )
+#ifdef NEOD_PLATFORM_FIC_NEO1973
+/*
+ * For neo, headset in headset out
+ * 05 02 01 05 02 00
+ * 05 02 00 05 02 01
+ * 05 02 01 05 02 00
+ */
+enum {
+ HEADSET_STATE_IDLE = 0,
+ HEADSET_STATE_START_IN,
+ HEADSET_STATE_START_OUT,
+ HEADSET_STATE_IN,
+ HEADSET_STATE_OUT,
+ HEADSET_STATE_END_IN,
+ HEADSET_STATE_END_OUT,
+};
+
+static int headset_state = HEADSET_STATE_IDLE;
+#endif
+
static gboolean moko_debug = TRUE;
GPollFD input_fd[10];
@@ -405,30 +425,79 @@
neod_buttonactions_set_display( 100 );
power_state = NORMAL;
}
- }
- else
- if ( event.type == 5 && event.code ==
HEADPHONE_INSERTION_SWITCHCODE )
- {
- if ( event.value == 0 ) /* inserted */
- {
- if ( moko_debug ) g_debug( "headphones IN" );
- g_spawn_command_line_async( "amixer sset \"Amp Mode\"
\"Headphones\"", NULL );
- }
- else if ( event.value == 1 ) /* released */
- {
- if ( moko_debug ) g_debug( "headphones OUT" );
- g_spawn_command_line_async( "amixer sset \"Amp Mode\"
\"Stereo Speakers\"", NULL );
- }
- neod_buttonactions_powersave_reset();
+ }
+ else
+ if ( event.type == 5 && event.code ==
HEADPHONE_INSERTION_SWITCHCODE )
+ {
+#ifdef NEOD_PLATFORM_FIC_NEO1973
+ if ( event.value == 1 ) /* inserted */
+ {
+ switch (headset_state) {
+ case HEADSET_STATE_IDLE:
+ headset_state = HEADSET_STATE_START_IN;
+ if ( moko_debug ) g_debug( "HEADSET_STATE_START_IN"
);
+ break;
+ case HEADSET_STATE_IN:
+ headset_state = HEADSET_STATE_END_IN;
+ if ( moko_debug ) g_debug( "HEADSET_STATE_END_IN" );
+ if ( moko_debug ) g_debug( "headphones IN" );
+ g_spawn_command_line_async( "dbus-send
--session --type=signal /org/openmoko/PhoneKit/Headset
org.openmoko.PhoneKit.Headset.HeadsetIn", NULL );
+ break;
+ case HEADSET_STATE_START_OUT:
+ headset_state = HEADSET_STATE_OUT;
+ if ( moko_debug ) g_debug( "HEADSET_STATE_OUT" );
+ break;
+ default:
+ headset_state = HEADSET_STATE_IDLE;
+ if ( moko_debug ) g_debug( "HEADSET_STATE_IDLE 1" );
+ break;
+ }
+ }
+ else if ( event.value == 0 ) /* released */
+ {
+ switch (headset_state) {
+ case HEADSET_STATE_IDLE:
+ headset_state = HEADSET_STATE_START_OUT;
+ if ( moko_debug ) g_debug(
"HEADSET_STATE_START_OUT" );
+ break;
+ case HEADSET_STATE_OUT:
+ headset_state = HEADSET_STATE_END_OUT;
+ if ( moko_debug ) g_debug( "HEADSET_STATE_END_OUT"
);
+ if ( moko_debug ) g_debug( "headphones OUT" );
+ g_spawn_command_line_async( "dbus-send
--session --type=signal /org/openmoko/PhoneKit/Headset
org.openmoko.PhoneKit.Headset.HeadsetOut", NULL );
+ break;
+ case HEADSET_STATE_START_IN:
+ headset_state = HEADSET_STATE_IN;
+ if ( moko_debug ) g_debug( "HEADSET_STATE_IN" );
+ break;
+ default:
+ headset_state = HEADSET_STATE_IDLE;
+ if ( moko_debug ) g_debug( "HEADSET_STATE_IDLE 0" );
+ break;
+ }
+ }
+#else
+ if ( event.value == 1 ) /* inserted */
+ {
+ if ( moko_debug ) g_debug( "headphones IN" );
+ g_spawn_command_line_async( "amixer sset \"Amp Mode\"
\"Headphones\"", NULL );
+ }
+ else if ( event.value == 0 ) /* released */
+ {
+ if ( moko_debug ) g_debug( "headphones OUT" );
+ g_spawn_command_line_async( "amixer sset \"Amp Mode\"
\"Stereo Speakers\"", NULL );
+ }
+#endif
+ neod_buttonactions_powersave_reset();
#if 0
- if ( power_state != NORMAL )
- {
- neod_buttonactions_set_display( 100 );
- power_state = NORMAL;
- }
+ if ( power_state != NORMAL )
+ {
+ neod_buttonactions_set_display( 100 );
+ power_state = NORMAL;
+ }
#endif
- }
- }
+ }
+ }
}
return TRUE;
}
--- End Message ---
--- Begin Message ---
Author: sean_chiang
Date: 2008-04-10 12:39:44 +0200 (Thu, 10 Apr 2008)
New Revision: 4337
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/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-dialer.c
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sound.c
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sound.h
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
Log:
control audio state when headset in / out
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/Makefile.am
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/Makefile.am
2008-04-10 10:37:21 UTC (rev 4336)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/Makefile.am
2008-04-10 10:39:44 UTC (rev 4337)
@@ -21,6 +21,7 @@
moko-pb.c moko-pb.h \
moko-pin.c moko-pin.h \
moko-mcc-dc.h \
+ moko-headset.c moko-headset.h \
$(BUILT_SOURCES)
phone_kit_LDADD = @DIALER_LIBS@ @JANA_LIBS@ @NOTIFY_LIBS@ @ALSA_LIBS@
$(top_srcdir)/src/common/libdialer-common.a
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
2008-04-10 10:37:21 UTC (rev 4336)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/dialer-main.c
2008-04-10 10:39:44 UTC (rev 4337)
@@ -31,6 +31,8 @@
#include "moko-dialer.h"
#include "moko-sms.h"
#include "moko-pb.h"
+#include "moko-headset.h"
+#include "moko-sound.h"
#include "moko-contacts.h"
@@ -340,6 +342,54 @@
on_network_status_changed (network, status, pb);
}
+static void
+headset_in_cb (DBusGProxy *proxy, const gchar *name, void *data)
+{
+ PhoneKitDialerStatus status;
+ MokoNetwork *network;
+ MokoDialer *dialer;
+
+ network = moko_network_get_default ();
+ dialer = moko_dialer_get_default (network);
+
+ status = moko_dialer_get_status(dialer);
+
+ moko_headset_status_set(HEADSET_STATUS_IN);
+
+ if ( PK_DIALER_NORMAL == status )
+ moko_sound_profile_set(SOUND_PROFILE_HEADSET);
+ if ( PK_DIALER_INCOMING == status )
+ moko_sound_profile_set(SOUND_PROFILE_HEADSET);
+ if ( PK_DIALER_DIALING == status )
+ moko_sound_profile_set(SOUND_PROFILE_HEADSET);
+ if ( PK_DIALER_TALKING == status )
+ moko_sound_profile_set(SOUND_PROFILE_GSM_HEADSET);
+}
+
+static void
+headset_out_cb (DBusGProxy *proxy, const gchar *name, void *data)
+{
+ PhoneKitDialerStatus status;
+ MokoNetwork *network;
+ MokoDialer *dialer;
+
+ network = moko_network_get_default ();
+ dialer = moko_dialer_get_default (network);
+
+ status = moko_dialer_get_status(dialer);
+
+ moko_headset_status_set(HEADSET_STATUS_OUT);
+
+ if ( PK_DIALER_NORMAL == status )
+ moko_sound_profile_set(SOUND_PROFILE_STEREO_OUT);
+ if ( PK_DIALER_INCOMING == status )
+ moko_sound_profile_set(SOUND_PROFILE_STEREO_OUT);
+ if ( PK_DIALER_DIALING == status )
+ moko_sound_profile_set(SOUND_PROFILE_STEREO_OUT);
+ if ( PK_DIALER_TALKING == status )
+ moko_sound_profile_set(SOUND_PROFILE_GSM_HANDSET);
+}
+
int
main (int argc, char **argv)
{
@@ -349,6 +399,7 @@
MokoPb *pb;
DBusGConnection *connection;
DBusGProxy *proxy;
+ DBusGProxy *headset_proxy;
GError *error = NULL;
guint32 ret;
@@ -418,6 +469,21 @@
SMS_PATH,
G_OBJECT (sms));
+ headset_proxy = dbus_g_proxy_new_for_name (connection,
+ NULL,
+ "/org/openmoko/PhoneKit/Headset",
+ "org.openmoko.PhoneKit.Headset");
+ dbus_g_proxy_add_signal (headset_proxy,
+ "HeadsetIn", G_TYPE_INVALID);
+ dbus_g_proxy_connect_signal (headset_proxy,
+ "HeadsetIn", G_CALLBACK (headset_in_cb),
+ NULL, NULL);
+ dbus_g_proxy_add_signal (headset_proxy,
+ "HeadsetOut", G_TYPE_INVALID);
+ dbus_g_proxy_connect_signal (headset_proxy,
+ "HeadsetOut", G_CALLBACK (headset_out_cb),
+ NULL, NULL);
+
/* Sync phonebook */
/* XXX this is not the right place! */
pb_sync (pb, network);
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
2008-04-10 10:37:21 UTC (rev 4336)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
2008-04-10 10:39:44 UTC (rev 4337)
@@ -40,6 +40,8 @@
#include "moko-sound.h"
#include "moko-pin.h"
+#include "moko-headset.h"
+
static void
listener_interface_init (gpointer g_iface, gpointer iface_data);
@@ -435,7 +437,12 @@
static int on_speaker = FALSE;
if (on_speaker)
- moko_sound_profile_set(SOUND_PROFILE_GSM_HANDSET);
+ {
+ if ( HEADSET_STATUS_IN == moko_headset_status_get() )
+ moko_sound_profile_set(SOUND_PROFILE_GSM_HEADSET);
+ else
+ moko_sound_profile_set(SOUND_PROFILE_GSM_HANDSET);
+ }
else
moko_sound_profile_set(SOUND_PROFILE_GSM_SPEAKER_OUT);
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sound.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sound.c
2008-04-10 10:37:21 UTC (rev 4336)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sound.c
2008-04-10 10:39:44 UTC (rev 4337)
@@ -27,6 +27,7 @@
"/usr/share/openmoko/scenarios/gsmheadset.state",
"/usr/share/openmoko/scenarios/gsmspeakerout.state",
"/usr/share/openmoko/scenarios/stereoout.state"
+ "/usr/share/openmoko/scenarios/headset.state"
};
void moko_sound_profile_set(int profile) {
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sound.h
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sound.h
2008-04-10 10:37:21 UTC (rev 4336)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sound.h
2008-04-10 10:39:44 UTC (rev 4337)
@@ -23,7 +23,8 @@
enum { SOUND_PROFILE_GSM_HANDSET,
SOUND_PROFILE_GSM_HEADSET,
SOUND_PROFILE_GSM_SPEAKER_OUT,
-SOUND_PROFILE_STEREO_OUT };
+SOUND_PROFILE_STEREO_OUT,
+SOUND_PROFILE_HEADSET};
void moko_sound_profile_set(int profile);
void moko_sound_profile_save(int profile);
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
2008-04-10 10:37:21 UTC (rev 4336)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
2008-04-10 10:39:44 UTC (rev 4337)
@@ -26,6 +26,8 @@
#include "moko-alsa-volume-control.h"
#include "moko-alsa-volume-scale.h"
+#include "moko-headset.h"
+
G_DEFINE_TYPE (MokoTalking, moko_talking, GTK_TYPE_WIDGET)
#define MOKO_TALKING_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
@@ -216,7 +218,10 @@
gtk_widget_hide (priv->incoming_bar);
gtk_widget_show_all (priv->main_bar);
- moko_sound_profile_set(SOUND_PROFILE_GSM_HANDSET);
+ if ( HEADSET_STATUS_IN == moko_headset_status_get() )
+ moko_sound_profile_set(SOUND_PROFILE_GSM_HEADSET);
+ else
+ moko_sound_profile_set(SOUND_PROFILE_GSM_HANDSET);
if (entry)
markup = g_strdup_printf ("<b>%s</b>\n%s", entry->contact->name, number);
@@ -296,7 +301,10 @@
gtk_widget_hide (priv->incoming_bar);
gtk_widget_show_all (priv->main_bar);
- moko_sound_profile_set(SOUND_PROFILE_GSM_HANDSET);
+ if ( HEADSET_STATUS_IN == moko_headset_status_get() )
+ moko_sound_profile_set(SOUND_PROFILE_GSM_HEADSET);
+ else
+ moko_sound_profile_set(SOUND_PROFILE_GSM_HANDSET);
if (entry)
markup = g_strdup_printf ("<b>%s</b>\n%s", entry->contact->name, number);
@@ -334,7 +342,10 @@
g_return_if_fail (MOKO_IS_TALKING (talking));
priv = talking->priv;
- moko_sound_profile_set(SOUND_PROFILE_STEREO_OUT);
+ if ( HEADSET_STATUS_IN == moko_headset_status_get() )
+ moko_sound_profile_set(SOUND_PROFILE_HEADSET);
+ else
+ moko_sound_profile_set(SOUND_PROFILE_STEREO_OUT);
if (priv->dtimer)
g_timer_destroy(priv->dtimer);
@@ -392,7 +403,10 @@
if (priv->timeout)
g_source_remove (priv->timeout);
- moko_sound_profile_set(SOUND_PROFILE_STEREO_OUT);
+ if ( HEADSET_STATUS_IN == moko_headset_status_get() )
+ moko_sound_profile_set(SOUND_PROFILE_HEADSET);
+ else
+ moko_sound_profile_set(SOUND_PROFILE_STEREO_OUT);
gtk_widget_hide (priv->window);
g_signal_emit (G_OBJECT (talking), talking_signals[CANCEL_CALL], 0);
}
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-04-10 12:55:41 +0200 (Thu, 10 Apr 2008)
New Revision: 4338
Modified:
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/openmoko-contacts
Log:
theme: rename add detail widget name to be more generic
Modified:
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/openmoko-contacts
===================================================================
---
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/openmoko-contacts
2008-04-10 10:39:44 UTC (rev 4337)
+++
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/openmoko-contacts
2008-04-10 10:55:41 UTC (rev 4338)
@@ -28,7 +28,7 @@
}
-widget "*moko-contacts-add-detail-button" style "mokocontactsadddetail"
+widget "*contacts-add-detail-button" style "mokocontactsadddetail"
# History view
style "mokohistorylabel" {
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-04-10 13:26:24 +0200 (Thu, 10 Apr 2008)
New Revision: 4339
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-history.c
Log:
2008-04-10 Thomas Wood <[EMAIL PROTECTED]>
* src/dialer/moko-history.c:
(create_new_contact_from_number): Correct dialog button order to be
consistent with other applications
(add_number_to_contact): Set the initial selected group and remove
dialog separator.
(moko_history_init): Use "contact-new" icon as in openmoko-messages
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2008-04-10 10:55:41 UTC (rev 4338)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2008-04-10 11:26:24 UTC (rev 4339)
@@ -1,3 +1,12 @@
+2008-04-10 Thomas Wood <[EMAIL PROTECTED]>
+
+ * src/dialer/moko-history.c:
+ (create_new_contact_from_number): Correct dialog button order to be
+ consistent with other applications
+ (add_number_to_contact): Set the initial selected group and remove
+ dialog separator.
+ (moko_history_init): Use "contact-new" icon as in openmoko-messages
+
2008-04-08 Thomas Wood <[EMAIL PROTECTED]>
* src/phone-kit/moko-network-dbus.xml:
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-history.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-history.c
2008-04-10 10:55:41 UTC (rev 4338)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-history.c
2008-04-10 11:26:24 UTC (rev 4339)
@@ -233,8 +233,8 @@
GtkWidget *dialog, *name, *label;
dialog = gtk_dialog_new_with_buttons ("Save as Contact",
- NULL, GTK_DIALOG_MODAL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL);
+ NULL, GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+ GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL);
gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
@@ -290,6 +290,7 @@
"Cancel", GTK_RESPONSE_CANCEL,
"Add", GTK_RESPONSE_OK,
NULL);
+ gtk_dialog_set_has_separator (GTK_DIALOG (window), FALSE);
book = e_book_new_system_addressbook (&err);
if (err)
@@ -321,6 +322,7 @@
hito_group_combo_connect_filter (HITO_GROUP_COMBO (groups_combo),
HITO_CONTACT_MODEL_FILTER (contact_filter));
gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (window)->vbox),
groups_combo);
+ gtk_combo_box_set_active (GTK_COMBO_BOX (groups_combo), 0);
@@ -944,7 +946,8 @@
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
priv->sms_button = item;
- item = gtk_tool_button_new_from_stock (GTK_STOCK_SAVE);
+ item = gtk_tool_button_new (NULL, NULL);
+ gtk_tool_button_set_icon_name (item, "contact-new");
gtk_tool_item_set_expand (item, TRUE);
g_signal_connect (item, "clicked",
G_CALLBACK (on_save_clicked), history);
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-04-10 13:35:43 +0200 (Thu, 10 Apr 2008)
New Revision: 4340
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/moko-save-number.c
Log:
2008-04-10 Thomas Wood <[EMAIL PROTECTED]>
* src/moko-save-number.c:
(create_new_contact_from_number): Correct dialog button order to be
consistent with other applications
(add_number_to_contact): Set the initial selected group and remove
dialog separator.
(moko_save_number): Remove debug statement
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2008-04-10 11:26:24 UTC (rev 4339)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2008-04-10 11:35:43 UTC (rev 4340)
@@ -1,3 +1,12 @@
+2008-04-10 Thomas Wood <[EMAIL PROTECTED]>
+
+ * src/moko-save-number.c:
+ (create_new_contact_from_number): Correct dialog button order to be
+ consistent with other applications
+ (add_number_to_contact): Set the initial selected group and remove
+ dialog separator.
+ (moko_save_number): Remove debug statement
+
2008-04-07 Thomas Wood <[EMAIL PROTECTED]>
* src/moko-save-number.c: (moko_save_number): Check number is not blank,
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/moko-save-number.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/moko-save-number.c
2008-04-10 11:26:24 UTC (rev 4339)
+++
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/moko-save-number.c
2008-04-10 11:35:43 UTC (rev 4340)
@@ -51,8 +51,10 @@
GtkWidget *dialog, *name, *label;
dialog = gtk_dialog_new_with_buttons ("Save as Contact",
- NULL, GTK_DIALOG_MODAL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL);
+ NULL, GTK_DIALOG_MODAL,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+ GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+ NULL);
gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
@@ -110,7 +112,9 @@
"Cancel", GTK_RESPONSE_CANCEL,
"Add", GTK_RESPONSE_OK,
NULL);
-
+
+ gtk_dialog_set_has_separator (GTK_DIALOG (window), FALSE);
+
book = e_book_new_system_addressbook (&err);
if (err)
return;
@@ -141,6 +145,7 @@
hito_group_combo_connect_filter (HITO_GROUP_COMBO (groups_combo),
HITO_CONTACT_MODEL_FILTER (contact_filter));
gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (window)->vbox),
groups_combo);
+ gtk_combo_box_set_active (GTK_COMBO_BOX (groups_combo), 0);
@@ -217,8 +222,6 @@
GtkWidget *window, *btn, *vbox;
SaveButtonInfo *btn_info;
-g_debug ("Sae number %s", number);
-
if (!number || !strcmp (number, ""))
{
GtkWidget *dlg;
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-04-10 16:08:23 +0200 (Thu, 10 Apr 2008)
New Revision: 4341
Removed:
trunk/src/target/opkg/libopkg/opkg.c
Modified:
trunk/src/target/opkg/libopkg/Makefile.am
Log:
opkg: remove old opkg.c
Modified: trunk/src/target/opkg/libopkg/Makefile.am
===================================================================
--- trunk/src/target/opkg/libopkg/Makefile.am 2008-04-10 11:35:43 UTC (rev
4340)
+++ trunk/src/target/opkg/libopkg/Makefile.am 2008-04-10 14:08:23 UTC (rev
4341)
@@ -30,7 +30,7 @@
libopkg_la_LIBADD = $(top_builddir)/libbb/libbb.la $(CURL_LIBS) $(GPGME_LIBS)
-opkg_core_sources = args.c args.h opkg.c \
+opkg_core_sources = args.c args.h \
user.c user.h
opkg_libcore_sources = args.c args.h libopkg.c libopkg.h opkg.h\
user.c user.h opkg_state.c opkg_state.h
Deleted: trunk/src/target/opkg/libopkg/opkg.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg.c 2008-04-10 11:35:43 UTC (rev
4340)
+++ trunk/src/target/opkg/libopkg/opkg.c 2008-04-10 14:08:23 UTC (rev
4341)
@@ -1,81 +0,0 @@
-/* opkg.c - the itsy package management system
-
- Carl D. Worth
-
- Copyright (C) 2001 University of Southern California
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2, or (at
- your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-*/
-
-#include "opkg.h"
-
-#include "args.h"
-#include "opkg_conf.h"
-#include "opkg_cmd.h"
-
-int main(int argc, const char *argv[])
-{
- int err, optind;
- args_t args;
- char *cmd_name;
- opkg_cmd_t *cmd;
- opkg_conf_t opkg_conf;
-
- error_list=NULL;
-
- args_init(&args);
-
- optind = args_parse(&args, argc, argv);
- if (optind == argc || optind < 0) {
- args_usage("opkg must have one sub-command argument");
- }
-
- cmd_name = argv[optind++];
-
- err = opkg_conf_init(&opkg_conf, &args);
- if (err) {
- return err;
- }
-
- args_deinit(&args);
-
- cmd = opkg_cmd_find(cmd_name);
- if (cmd == NULL) {
- fprintf(stderr, "%s: unknown sub-command %s\n", argv[0], cmd_name);
- args_usage(NULL);
- }
-
- if (cmd->requires_args && optind == argc) {
- fprintf(stderr, "%s: the ``%s'' command requires at least one
argument\n",
- __FUNCTION__, cmd_name);
- args_usage(NULL);
- }
-
- err = opkg_cmd_exec(cmd, &opkg_conf, argc - optind, argv + optind);
-
- if ( err == 0 ) {
- opkg_message(opkg_conf, OPKG_NOTICE, "Succesfully done.\n");
- } else {
- opkg_message(opkg_conf, OPKG_NOTICE, "Error returned. Return value is
%d\n.",err);
-
-}
-
- }
- /* XXX: FEATURE request: run ldconfig and/or depmod after package needing
them are installed or removed */
- // opkg_global_postinst();
-
- opkg_conf_deinit(&opkg_conf);
-
- return err;
-}
-
-
-
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
