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. r3653 - in
trunk/src/target/OM-2007.2/applications/openmoko-messages2: . src
([EMAIL PROTECTED])
2. r3654 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
3. r3655 - in
trunk/src/target/OM-2007.2/applications/openmoko-calculator2:
data po ([EMAIL PROTECTED])
--- Begin Message ---
Author: chris
Date: 2007-12-14 16:56:08 +0100 (Fri, 14 Dec 2007)
New Revision: 3653
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-contacts.c
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.c
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.h
Log:
* src/sms-contacts.c: (delete_clicked_cb):
Hook up the delete button to delete all messages from currently selected
contact
* src/sms-notes.c: (delete_all_clicked_cb):
Hook up the delete-all button to delete all messages from the currently
selected contact.
* src/sms-utils.c: (sms_delete_selected_contact_messages):
* src/sms-utils.h:
Add function to delete all messages from a contact, or from unknown
contacts
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2007-12-14 15:38:34 UTC (rev 3652)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2007-12-14 15:56:08 UTC (rev 3653)
@@ -1,5 +1,20 @@
2007-12-14 Chris Lord <[EMAIL PROTECTED]>
+ * src/sms-contacts.c: (delete_clicked_cb):
+ Hook up the delete button to delete all messages from currently selected
+ contact
+
+ * src/sms-notes.c: (delete_all_clicked_cb):
+ Hook up the delete-all button to delete all messages from the currently
+ selected contact.
+
+ * src/sms-utils.c: (sms_delete_selected_contact_messages):
+ * src/sms-utils.h:
+ Add function to delete all messages from a contact, or from unknown
+ contacts
+
+2007-12-14 Chris Lord <[EMAIL PROTECTED]>
+
* src/sms-compose.c: (page_shown), (page_hidden):
Connect to delete/delete-all button clicks (doesn't do anything yet)
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-contacts.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-contacts.c
2007-12-14 15:38:34 UTC (rev 3652)
+++
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-contacts.c
2007-12-14 15:56:08 UTC (rev 3653)
@@ -248,6 +248,8 @@
delete_clicked_cb (GtkToolButton *button, SmsData *data)
{
if (hidden) return;
+
+ sms_delete_selected_contact_messages (data);
}
static void
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
2007-12-14 15:38:34 UTC (rev 3652)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
2007-12-14 15:56:08 UTC (rev 3653)
@@ -498,6 +498,8 @@
delete_all_clicked_cb (GtkToolButton *button, SmsData *data)
{
if (hidden) return;
+
+ sms_delete_selected_contact_messages (data);
}
GtkWidget *
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.c
2007-12-14 15:38:34 UTC (rev 3652)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.c
2007-12-14 15:56:08 UTC (rev 3653)
@@ -51,6 +51,75 @@
return contact;
}
+void
+sms_delete_selected_contact_messages (SmsData *data)
+{
+ EContact *contact;
+ GtkWidget *dialog;
+
+ contact = sms_get_selected_contact (data);
+ dialog = gtk_message_dialog_new (GTK_WINDOW (data->window),
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
+ "Delete all messages from %s?", contact ? (const gchar *)
+ e_contact_get_const (contact, E_CONTACT_FULL_NAME) :
+ "unknown contacts");
+ gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CANCEL,
+ GTK_RESPONSE_CANCEL, GTK_STOCK_DELETE, GTK_RESPONSE_YES, NULL);
+
+ if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_YES) {
+ gtk_widget_destroy (dialog);
+ return;
+ }
+
+ gtk_widget_destroy (dialog);
+
+ if (contact) {
+ gint i, j;
+
+ for (i = E_CONTACT_FIRST_PHONE_ID;
+ i <= E_CONTACT_LAST_PHONE_ID; i++) {
+ SmsNoteCountData *ncdata;
+ const gchar *number = e_contact_get_const (
+ contact, (EContactField)i);
+ if (!number) continue;
+
+ ncdata = g_hash_table_lookup (data->note_count, number);
+ if (!ncdata) continue;
+
+ for (j = 0; j < 2; j++) {
+ GList *uids = j ? ncdata->read : ncdata->unread;
+ for (; uids; uids = uids->next) {
+ /* TODO: Add
+ * jana_store_remove_component_from_uid
+ * to libjana?
+ */
+ JanaComponent *comp =
+ jana_store_get_component (
+ data->notes,
+ uids->data);
+ jana_store_remove_component (
+ data->notes, comp);
+ g_object_unref (comp);
+ }
+ }
+
+ g_hash_table_remove (data->note_count, number);
+ }
+
+ g_object_unref (contact);
+ } else {
+ while (data->unassigned_notes) {
+ JanaComponent *comp = jana_store_get_component (
+ data->notes, data->unassigned_notes->data);
+ jana_store_remove_component (data->notes, comp);
+ g_object_unref (comp);
+ data->unassigned_notes = g_list_delete_link (
+ data->unassigned_notes, data->unassigned_notes);
+ }
+ }
+}
+
/* Following two functions taken from pimlico Contacts and modified slightly */
static void
contact_photo_size (GdkPixbufLoader * loader, gint width, gint height,
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.h
2007-12-14 15:38:34 UTC (rev 3652)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.h
2007-12-14 15:56:08 UTC (rev 3653)
@@ -25,5 +25,6 @@
EContact *sms_get_selected_contact (SmsData *data);
GdkPixbuf *sms_contact_load_photo (EContact *contact);
gboolean sms_contacts_note_count_update (SmsData *data);
+void sms_delete_selected_contact_messages (SmsData *data);
#endif /* SMS_UTILS_H */
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-12-14 19:06:58 +0100 (Fri, 14 Dec 2007)
New Revision: 3654
Modified:
branches/src/target/kernel/2.6.24.x/patches/s3c2410_touchscreen.patch
Log:
fix typos and syntax errors in touchscreen driver
Modified: branches/src/target/kernel/2.6.24.x/patches/s3c2410_touchscreen.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/s3c2410_touchscreen.patch
2007-12-14 15:56:08 UTC (rev 3653)
+++ branches/src/target/kernel/2.6.24.x/patches/s3c2410_touchscreen.patch
2007-12-14 18:06:58 UTC (rev 3654)
@@ -427,7 +427,7 @@
+ if (request_irq(IRQ_TC, stylus_updown, IRQF_SAMPLE_RANDOM,
+ "s3c2410_action", ts.dev)) {
+ printk(KERN_ERR "s3c2410_ts.c: Could not allocate ts IRQ_TC
!\n");
-+ free_irq(IRQ_ADC);
++ free_irq(IRQ_ADC, ts.dev);
+ iounmap(base_addr);
+ return -EIO;
+ }
@@ -437,10 +437,10 @@
+ /* All went ok, so register to the input system */
+ rc = input_register_device(ts.dev);
+ if (rc) {
-+ free_irq(IRQ_TC);
-+ free_irq(IRQ_ADC);
++ free_irq(IRQ_TC, ts.dev);
++ free_irq(IRQ_ADC, ts.dev);
+ clk_disable(adc_clock);
-+ ionumap(base_addr);
++ iounmap(base_addr);
+ return -EIO;
+ }
+
--- End Message ---
--- Begin Message ---
Author: ortalo
Date: 2007-12-14 21:48:41 +0100 (Fri, 14 Dec 2007)
New Revision: 3655
Added:
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/data/openmoko-calculator.desktop.in
Removed:
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/data/openmoko-calculator.desktop
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/data/Makefile.am
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/po/POTFILES.in
Log:
Addition of a translatable .desktop file.
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/data/Makefile.am
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/data/Makefile.am
2007-12-14 18:06:58 UTC (rev 3654)
+++
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/data/Makefile.am
2007-12-14 20:48:41 UTC (rev 3655)
@@ -2,11 +2,15 @@
# misc. data files
#
# None yet
-# dist_pkgdata_DATA =
#
# desktop integration: .desktop file
#
desktopdir = $(datadir)/applications
-dist_desktop_DATA = openmoko-calculator.desktop
+desktop_in_files = openmoko-calculator.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
[EMAIL PROTECTED]@
+EXTRA_DIST = $(desktop_in_files)
+
+DISTCLEANFILES = $(desktop_DATA)
Deleted:
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/data/openmoko-calculator.desktop
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/data/openmoko-calculator.desktop
2007-12-14 18:06:58 UTC (rev 3654)
+++
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/data/openmoko-calculator.desktop
2007-12-14 20:48:41 UTC (rev 3655)
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=Calculator
-Comment=Perform simple calculations
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Exec=openmoko-calculator
-Icon=openmoko-calculator
-Terminal=false
-Categories=GTK;Application;Office
-SingleInstance=true
-StartupNotify=true
Added:
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/data/openmoko-calculator.desktop.in
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/data/openmoko-calculator.desktop.in
2007-12-14 18:06:58 UTC (rev 3654)
+++
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/data/openmoko-calculator.desktop.in
2007-12-14 20:48:41 UTC (rev 3655)
@@ -0,0 +1,12 @@
+[Desktop Entry]
+_Name=Calculator
+_Comment=Perform simple calculations
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Exec=openmoko-calculator
+Icon=openmoko-calculator
+Terminal=false
+Categories=GTK;Application;Office
+SingleInstance=true
+StartupNotify=true
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/po/POTFILES.in
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-calculator2/po/POTFILES.in
2007-12-14 18:06:58 UTC (rev 3654)
+++ trunk/src/target/OM-2007.2/applications/openmoko-calculator2/po/POTFILES.in
2007-12-14 20:48:41 UTC (rev 3655)
@@ -1,2 +1,2 @@
-data/openmoko-calculator.desktop
+data/openmoko-calculator.desktop.in
src/calc-main.c
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
