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. r3658 - in
trunk/src/target/OM-2007.2/applications/openmoko-messages2: . src
([EMAIL PROTECTED])
2. r3659 - in
trunk/src/target/OM-2007.2/applications/openmoko-messages2: . src
([EMAIL PROTECTED])
3. r3660 - in
trunk/src/target/OM-2007.2/applications/openmoko-messages2: . src
([EMAIL PROTECTED])
4. r3661 - in
trunk/src/target/OM-2007.2/applications/openmoko-messages2: . src
([EMAIL PROTECTED])
5. r3662 -
trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd
([EMAIL PROTECTED])
6. r3663 - in trunk/src/target/OM-2007.2/libraries/libmokogsmd2:
. libmokogsmd ([EMAIL PROTECTED])
--- Begin Message ---
Author: chris
Date: 2007-12-17 13:11:35 +0100 (Mon, 17 Dec 2007)
New Revision: 3658
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.h
Log:
* src/sms-contacts.c: (delete_all_added_cb),
(delete_all_progress_cb), (delete_all_clicked_cb):
Implement delete-all functionality in the contacts view
* src/sms.h:
Remove unused variable
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2007-12-17 09:31:02 UTC (rev 3657)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2007-12-17 12:11:35 UTC (rev 3658)
@@ -1,3 +1,12 @@
+2007-12-17 Chris Lord <[EMAIL PROTECTED]>
+
+ * src/sms-contacts.c: (delete_all_added_cb),
+ (delete_all_progress_cb), (delete_all_clicked_cb):
+ Implement delete-all functionality in the contacts view
+
+ * src/sms.h:
+ Remove unused variable
+
2007-12-14 Chris Lord <[EMAIL PROTECTED]>
* src/sms-contacts.c: (delete_clicked_cb):
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-17 09:31:02 UTC (rev 3657)
+++
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-contacts.c
2007-12-17 12:11:35 UTC (rev 3658)
@@ -253,9 +253,50 @@
}
static void
+delete_all_added_cb (JanaStoreView *store_view, GList *components,
+ SmsData *data)
+{
+ for (; components; components = components->next) {
+ JanaComponent *comp = JANA_COMPONENT (components->data);
+ jana_store_remove_component (
+ jana_store_view_get_store (store_view), comp);
+ }
+}
+
+static void
+delete_all_progress_cb (JanaStoreView *store_view, gint percent,
+ SmsData *data)
+{
+ if (percent == 100) g_object_unref (store_view);
+}
+
+static void
delete_all_clicked_cb (GtkToolButton *button, SmsData *data)
{
+ JanaStoreView *notes_view;
+ GtkWidget *dialog;
+ gint response;
+
if (hidden) return;
+
+ dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (data->window),
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
+ "Delete <b>all</b> messages?");
+ gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CANCEL,
+ GTK_RESPONSE_CANCEL, GTK_STOCK_DELETE, GTK_RESPONSE_YES, NULL);
+
+ response = gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ if (response != GTK_RESPONSE_YES) return;
+
+ /* Delete all messages */
+ notes_view = jana_store_get_view (data->notes);
+ g_signal_connect (notes_view, "added",
+ G_CALLBACK (delete_all_added_cb), data);
+ g_signal_connect (notes_view, "progress",
+ G_CALLBACK (delete_all_progress_cb), data);
+ jana_store_view_start (notes_view);
}
GtkWidget *
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms.h
2007-12-17 09:31:02 UTC (rev 3657)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms.h
2007-12-17 12:11:35 UTC (rev 3658)
@@ -35,7 +35,6 @@
typedef struct {
JanaStore *notes;
- JanaStoreView *notes_view;
GtkTreeModel *note_store;
GtkTreeModel *note_filter;
GHashTable *note_count;
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2007-12-17 14:27:38 +0100 (Mon, 17 Dec 2007)
New Revision: 3659
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
Log:
* src/sms-notes.c: (delete_clicked_cb):
Implement delete functionality in notes view (allows deleting of
individual messages)
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2007-12-17 12:11:35 UTC (rev 3658)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2007-12-17 13:27:38 UTC (rev 3659)
@@ -1,5 +1,11 @@
2007-12-17 Chris Lord <[EMAIL PROTECTED]>
+ * src/sms-notes.c: (delete_clicked_cb):
+ Implement delete functionality in notes view (allows deleting of
+ individual messages)
+
+2007-12-17 Chris Lord <[EMAIL PROTECTED]>
+
* src/sms-contacts.c: (delete_all_added_cb),
(delete_all_progress_cb), (delete_all_clicked_cb):
Implement delete-all functionality in the contacts view
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-17 12:11:35 UTC (rev 3658)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
2007-12-17 13:27:38 UTC (rev 3659)
@@ -491,7 +491,43 @@
static void
delete_clicked_cb (GtkToolButton *button, SmsData *data)
{
+ gchar *uid;
+ gint response;
+ GtkTreeIter iter;
+ GtkWidget *dialog;
+ GtkTreeModel *model;
+ JanaComponent *comp;
+ GtkTreeSelection *selection;
+
if (hidden) return;
+
+ dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (data->window),
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
+ "Delete selected message?");
+ gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CANCEL,
+ GTK_RESPONSE_CANCEL, GTK_STOCK_DELETE, GTK_RESPONSE_YES, NULL);
+
+ response = gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ if (response != GTK_RESPONSE_YES) return;
+
+ selection = gtk_tree_view_get_selection (
+ GTK_TREE_VIEW (data->notes_treeview));
+ if (!selection ||
+ !gtk_tree_selection_get_selected (selection, &model, &iter))
+ return;
+
+ gtk_tree_model_get (model, &iter,
+ JANA_GTK_NOTE_STORE_COL_UID, &uid, -1);
+ if (!uid) return;
+
+ comp = jana_store_get_component (data->notes, uid);
+ if (!comp) return;
+
+ jana_store_remove_component (data->notes, comp);
+ g_object_unref (comp);
+ g_free (uid);
}
static void
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2007-12-17 15:15:42 +0100 (Mon, 17 Dec 2007)
New Revision: 3660
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.h
Log:
* src/sms-contacts.c: (search_toggled_cb),
(search_text_changed_cb), (search_combo_changed_cb),
(contacts_visible_func), (sms_contacts_page_new):
* src/sms.h:
Add contacts filtering via search string
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2007-12-17 13:27:38 UTC (rev 3659)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2007-12-17 14:15:42 UTC (rev 3660)
@@ -1,5 +1,13 @@
2007-12-17 Chris Lord <[EMAIL PROTECTED]>
+ * src/sms-contacts.c: (search_toggled_cb),
+ (search_text_changed_cb), (search_combo_changed_cb),
+ (contacts_visible_func), (sms_contacts_page_new):
+ * src/sms.h:
+ Add contacts filtering via search string
+
+2007-12-17 Chris Lord <[EMAIL PROTECTED]>
+
* src/sms-notes.c: (delete_clicked_cb):
Implement delete functionality in notes view (allows deleting of
individual messages)
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-17 13:27:38 UTC (rev 3659)
+++
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-contacts.c
2007-12-17 14:15:42 UTC (rev 3660)
@@ -299,11 +299,64 @@
jana_store_view_start (notes_view);
}
+static void
+search_toggled_cb (MokoSearchBar *bar, gboolean search_visible, SmsData *data)
+{
+ gtk_tree_model_filter_refilter (
+ GTK_TREE_MODEL_FILTER (data->contacts_filter));
+}
+
+static void
+search_text_changed_cb (MokoSearchBar *bar, GtkEditable *editable,
+ SmsData *data)
+{
+ gtk_tree_model_filter_refilter (
+ GTK_TREE_MODEL_FILTER (data->contacts_filter));
+}
+
+static void
+search_combo_changed_cb (MokoSearchBar *bar, GtkComboBox *combo_box,
+ SmsData *data)
+{
+ gtk_tree_model_filter_refilter (
+ GTK_TREE_MODEL_FILTER (data->contacts_filter));
+}
+
+static
+gboolean contacts_visible_func (GtkTreeModel *model, GtkTreeIter *iter,
+ SmsData *data)
+{
+ if (moko_search_bar_search_visible (
+ MOKO_SEARCH_BAR (data->contacts_search))) {
+ const gchar *search;
+ gboolean result;
+ gchar *name;
+
+ search = gtk_entry_get_text (moko_search_bar_get_entry (
+ MOKO_SEARCH_BAR (data->contacts_search)));
+
+ if ((!search) || (search[0] == '\0')) return TRUE;
+
+ /* Filter on search query */
+ gtk_tree_model_get (model, iter, COL_NAME, &name, -1);
+ if (!name) return FALSE;
+
+ /* FIXME: Use a proper UTF-8 casefold comparison here */
+ result = strcasestr (name, search) ? TRUE : FALSE;
+ g_free (name);
+
+ return result;
+ } else {
+ /* Filter on selected category */
+ return TRUE;
+ }
+}
+
GtkWidget *
sms_contacts_page_new (SmsData *data)
{
EBookQuery *qrys[(E_CONTACT_LAST_PHONE_ID-E_CONTACT_FIRST_PHONE_ID)+1];
- GtkWidget *searchbar, *scroll, *vbox;
+ GtkWidget *contacts_combo, *scroll, *vbox;
GtkCellRenderer *renderer;
EBookQuery *tel_query;
EBookView *view;
@@ -383,13 +436,22 @@
(GType []){G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
GDK_TYPE_PIXBUF, G_TYPE_INT, G_TYPE_BOOLEAN },
(GtkTreeModelFilterModifyFunc)nophoto_filter_func, data, NULL);
+ gtk_tree_model_filter_set_visible_func ((GtkTreeModelFilter *)
+ data->contacts_filter, (GtkTreeModelFilterVisibleFunc)
+ contacts_visible_func, data, NULL);
/* Create groups model */
- data->contacts_combo = gtk_combo_box_new_text ();
+ contacts_combo = gtk_combo_box_new_text ();
/* Create search box */
- searchbar = moko_search_bar_new_with_combo (
- GTK_COMBO_BOX (data->contacts_combo));
+ data->contacts_search = moko_search_bar_new_with_combo (
+ GTK_COMBO_BOX (contacts_combo));
+ g_signal_connect (data->contacts_search, "toggled",
+ G_CALLBACK (search_toggled_cb), data);
+ g_signal_connect (data->contacts_search, "text_changed",
+ G_CALLBACK (search_text_changed_cb), data);
+ g_signal_connect (data->contacts_search, "combo_changed",
+ G_CALLBACK (search_combo_changed_cb), data);
/* Create tree view */
data->contacts_treeview = gtk_tree_view_new_with_model (
@@ -419,7 +481,7 @@
/* Pack widgets into vbox and return */
vbox = gtk_vbox_new (FALSE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), searchbar, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), data->contacts_search, FALSE, TRUE,
0);
gtk_box_pack_start (GTK_BOX (vbox), scroll, TRUE, TRUE, 0);
gtk_widget_show_all (vbox);
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms.h
2007-12-17 13:27:38 UTC (rev 3659)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms.h
2007-12-17 14:15:42 UTC (rev 3660)
@@ -62,7 +62,7 @@
guint notes_scroll_idle;
GtkWidget *contacts_treeview;
- GtkWidget *contacts_combo;
+ GtkWidget *contacts_search;
GdkPixbuf *no_photo;
GtkWidget *sms_textview;
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2007-12-17 15:56:09 +0100 (Mon, 17 Dec 2007)
New Revision: 3661
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-messages2/configure.ac
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.h
Log:
* configure.ac:
Add AC_GNU_SOURCE for strcasestr
* src/sms-contacts.c:
Include config.h first
* src/sms-notes.c: (search_toggled_cb), (search_text_changed_cb),
(search_combo_changed_cb), (notes_visible_func),
(sms_notes_page_new):
* src/sms.h:
Add notes filtering via search string
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2007-12-17 14:15:42 UTC (rev 3660)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2007-12-17 14:56:09 UTC (rev 3661)
@@ -1,5 +1,19 @@
2007-12-17 Chris Lord <[EMAIL PROTECTED]>
+ * configure.ac:
+ Add AC_GNU_SOURCE for strcasestr
+
+ * src/sms-contacts.c:
+ Include config.h first
+
+ * src/sms-notes.c: (search_toggled_cb), (search_text_changed_cb),
+ (search_combo_changed_cb), (notes_visible_func),
+ (sms_notes_page_new):
+ * src/sms.h:
+ Add notes filtering via search string
+
+2007-12-17 Chris Lord <[EMAIL PROTECTED]>
+
* src/sms-contacts.c: (search_toggled_cb),
(search_text_changed_cb), (search_combo_changed_cb),
(contacts_visible_func), (sms_contacts_page_new):
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/configure.ac
2007-12-17 14:15:42 UTC (rev 3660)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/configure.ac
2007-12-17 14:56:09 UTC (rev 3661)
@@ -9,6 +9,7 @@
AC_PROG_CC
AC_STDC_HEADERS
AC_PROG_LIBTOOL
+AC_GNU_SOURCE
PKG_CHECK_MODULES(EBOOK, libebook-1.2)
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6.0)
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-17 14:15:42 UTC (rev 3660)
+++
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-contacts.c
2007-12-17 14:56:09 UTC (rev 3661)
@@ -17,14 +17,15 @@
* Current Version: $Rev$ ($Date$) [$Author$]
*/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "sms-contacts.h"
#include "sms-utils.h"
#include <libmokoui2/moko-finger-scroll.h>
#include <libmokoui2/moko-search-bar.h>
#include <string.h>
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
static const gchar *clear_numbers_uid;
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-17 14:15:42 UTC (rev 3660)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
2007-12-17 14:56:09 UTC (rev 3661)
@@ -17,6 +17,10 @@
* Current Version: $Rev$ ($Date$) [$Author$]
*/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "sms-notes.h"
#include "sms-utils.h"
#include <libjana/jana.h>
@@ -538,10 +542,64 @@
sms_delete_selected_contact_messages (data);
}
+static void
+search_toggled_cb (MokoSearchBar *bar, gboolean search_visible, SmsData *data)
+{
+ gtk_tree_model_filter_refilter (
+ GTK_TREE_MODEL_FILTER (data->note_filter));
+}
+
+static void
+search_text_changed_cb (MokoSearchBar *bar, GtkEditable *editable,
+ SmsData *data)
+{
+ gtk_tree_model_filter_refilter (
+ GTK_TREE_MODEL_FILTER (data->note_filter));
+}
+
+static void
+search_combo_changed_cb (MokoSearchBar *bar, GtkComboBox *combo_box,
+ SmsData *data)
+{
+ gtk_tree_model_filter_refilter (
+ GTK_TREE_MODEL_FILTER (data->note_filter));
+}
+
+static
+gboolean notes_visible_func (GtkTreeModel *model, GtkTreeIter *iter,
+ SmsData *data)
+{
+ if (moko_search_bar_search_visible (
+ MOKO_SEARCH_BAR (data->notes_search))) {
+ const gchar *search;
+ gboolean result;
+ gchar *body;
+
+ search = gtk_entry_get_text (moko_search_bar_get_entry (
+ MOKO_SEARCH_BAR (data->notes_search)));
+
+ if ((!search) || (search[0] == '\0')) return TRUE;
+
+ /* Filter on search query */
+ gtk_tree_model_get (model, iter, JANA_GTK_NOTE_STORE_COL_BODY,
+ &body, -1);
+ if (!body) return FALSE;
+
+ /* FIXME: Use a proper UTF-8 casefold comparison here */
+ result = strcasestr (body, search) ? TRUE : FALSE;
+ g_free (body);
+
+ return result;
+ } else {
+ /* Filter on selected category */
+ return TRUE;
+ }
+}
+
GtkWidget *
sms_notes_page_new (SmsData *data)
{
- GtkWidget *scroll, *vbox, *searchbar;
+ GtkWidget *scroll, *vbox, *notes_combo;
GtkCellRenderer *renderer;
GHashTable *colours_hash;
@@ -563,6 +621,9 @@
/* Create model and filter */
data->note_store = jana_gtk_note_store_new ();
data->note_filter = gtk_tree_model_filter_new (data->note_store, NULL);
+ gtk_tree_model_filter_set_visible_func ((GtkTreeModelFilter *)
+ data->note_filter, (GtkTreeModelFilterVisibleFunc)
+ notes_visible_func, data, NULL);
/* Create a category-colour hash for the cell renderer */
colours_hash = g_hash_table_new (g_str_hash, g_str_equal);
@@ -580,16 +641,22 @@
(GtkTreeCellDataFunc)sms_notes_data_func, data, NULL);
/* Create search bar */
- data->notes_combo = gtk_combo_box_new_text ();
- searchbar = moko_search_bar_new_with_combo (
- GTK_COMBO_BOX (data->notes_combo));
+ notes_combo = gtk_combo_box_new_text ();
+ data->notes_search = moko_search_bar_new_with_combo (
+ GTK_COMBO_BOX (notes_combo));
+ g_signal_connect (data->notes_search, "toggled",
+ G_CALLBACK (search_toggled_cb), data);
+ g_signal_connect (data->notes_search, "text_changed",
+ G_CALLBACK (search_text_changed_cb), data);
+ g_signal_connect (data->notes_search, "combo_changed",
+ G_CALLBACK (search_combo_changed_cb), data);
/* Pack widgets */
scroll = moko_finger_scroll_new ();
gtk_container_add (GTK_CONTAINER (scroll), data->notes_treeview);
vbox = gtk_vbox_new (FALSE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), searchbar, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), data->notes_search, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), scroll, TRUE, TRUE, 0);
gtk_widget_show_all (vbox);
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms.h
2007-12-17 14:15:42 UTC (rev 3660)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms.h
2007-12-17 14:56:09 UTC (rev 3661)
@@ -53,7 +53,7 @@
GtkToolItem *delete_all_button;
GtkToolItem *delete_button;
- GtkWidget *notes_combo;
+ GtkWidget *notes_search;
GdkPixbuf *author_icon;
GdkPixbuf *recipient_icon;
gchar *recipient_number;
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-12-17 16:44:30 +0100 (Mon, 17 Dec 2007)
New Revision: 3662
Modified:
trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.c
Log:
libmokogsmd2: silence DEBUG output -- closes #1035
Modified:
trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.c
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.c
2007-12-17 14:56:09 UTC (rev 3661)
+++
trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.c
2007-12-17 15:44:30 UTC (rev 3662)
@@ -27,8 +27,8 @@
#include <fcntl.h>
#include <errno.h>
-#define DEBUG_THIS_FILE
-//#undef DEBUG_THIS_FILE
+//#define DEBUG_THIS_FILE
+#undef DEBUG_THIS_FILE
#ifdef DEBUG_THIS_FILE
#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-12-17 18:44:07 +0100 (Mon, 17 Dec 2007)
New Revision: 3663
Modified:
trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog
trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.c
trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.h
Log:
libmokogsmd2: keep track of GSM cipher status
Modified: trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog 2007-12-17
15:44:30 UTC (rev 3662)
+++ trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog 2007-12-17
17:44:07 UTC (rev 3663)
@@ -1,3 +1,9 @@
+2007-12-17 Michael Lauer <[EMAIL PROTECTED]>
+
+ * libmokogsmd/moko-gsmd-connection.[c|h]:
+ Register and emit gobject signal for when
+ "cipher-status" changes.
+
2007-11-29 Michael Lauer <[EMAIL PROTECTED]>
* libmokogsmd/moko-gsmd-connection.[c|h]:
Modified:
trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.c
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.c
2007-12-17 15:44:30 UTC (rev 3662)
+++
trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.c
2007-12-17 17:44:07 UTC (rev 3663)
@@ -259,7 +259,20 @@
//TODO add SIGNAL_GSMD_EVT_CALL_WAIT = 10, /* Call Waiting */
//TODO add SIGNAL_GSMD_EVT_TIMEZONE = 11, /* Timezone change */
//TODO add SIGNAL_GSMD_EVT_SUBSCRIPTIONS = 12, /* To which events are we
subscribed to */
- //TODO add SIGNAL_GSMD_EVT_CIPHER = 13, /* Chiphering Information
*/
+
+ moko_gsmd_connection_signals[SIGNAL_GSMD_EVT_CIPHER] = g_signal_new
+ ("cipher-status-changed",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS,
+ G_STRUCT_OFFSET (MokoGsmdConnectionClass, cipher_status_changed ),
+ NULL,
+ NULL,
+ g_cclosure_marshal_VOID__INT,
+ G_TYPE_NONE,
+ 1,
+ G_TYPE_INT,
+ NULL );
+
//TODO add SIGNAL_GSMD_EVT_IN_CBM = 14, /* Incoming Cell Broadcast
message */
//TODO add SIGNAL_GSMD_EVT_IN_DS = 15, /* SMS Status Report */
@@ -495,9 +508,9 @@
break;
case GSMD_EVT_OUT_STATUS:
g_signal_emit( G_OBJECT(self),
- moko_gsmd_connection_signals[SIGNAL_GSMD_EVT_OUT_STATUS],
- 0,
- aux->u.call_status.prog );
+
moko_gsmd_connection_signals[SIGNAL_GSMD_EVT_OUT_STATUS],
+ 0,
+ aux->u.call_status.prog );
break;
case GSMD_EVT_OUT_COLP:
/* moko_gsmd_connection_signals[SIGNAL_GSMD_EVT_OUT_COLP]; */
@@ -512,6 +525,12 @@
/* moko_gsmd_connection_signals[SIGNAL_GSMD_EVT_SUBSCRIPTIONS]; */
break;
case GSMD_EVT_CIPHER:
+ g_debug( "CIPHER event: data = %d, %d, %d", aux->u.cipher.flags,
aux->u.cipher.net_state_gsm, aux->u.cipher.net_state_gprs );
+ g_signal_emit( G_OBJECT(self),
+
moko_gsmd_connection_signals[SIGNAL_GSMD_EVT_CIPHER],
+ 0,
+ aux->u.cipher.flags );
+ //TODO check whether the net states are important, if so, change
signal
/* moko_gsmd_connection_signals[SIGNAL_GSMD_EVT_CIPHER]; */
break;
case GSMD_EVT_IN_CBM:
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-12-17 15:44:30 UTC (rev 3662)
+++
trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.h
2007-12-17 17:44:07 UTC (rev 3663)
@@ -52,6 +52,7 @@
void (*network_registration) (MokoGsmdConnection* self, int type, int lac,
int cell);
void (*signal_strength_changed) (MokoGsmdConnection* self, int strength);
void (*network_current_operator) (MokoGsmdConnection* self, const gchar*
name );
+ void (*cipher_status_changed) (MokoGsmdConnection* self, int status );
/* Misc */
void (*gsmd_connection_status) (MokoGsmdConnection* self, gboolean status);
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
