Changeset 2020

Timestamp:

05/18/07 18:42:12 (6 years ago)

Author:

thomas

Message:

Patch by: Neil J Patel <njp@…>

• src/contacts-callbacks-ui.c: (contacts_delete_cb):
• src/contacts-history.c: (contacts_history_refresh_ui):
• Replaces GtkDialog? with MokoMessageDialog?.
• Shows 'No communication history', when there is no communication history.

Location:

trunk/src/target/OM-2007/applications/openmoko-contacts

Files:

• ChangeLog (modified) (1 diff)
• src/contacts-callbacks-ui.c (modified) (4 diffs)
• src/contacts-history.c (modified) (2 diffs)

trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog

@@ +1 @@
+2007-05-18  Thomas Wood  <thomas@openedhand.com>
+
+        Patch by: Neil J Patel <njp@o-hand.com>
+
+        * src/contacts-callbacks-ui.c: (contacts_delete_cb):
+        * src/contacts-history.c: (contacts_history_refresh_ui):
+        - Replaces GtkDialog with MokoMessageDialog.
+        - Shows 'No communication history', when there is no
+          communication history.
+
+
+
 2007-05-18  Thomas Wood  <thomas@openedhand.com>
 

trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ui.c

@@ -35 +35 @@
 #include "contacts-main.h"
 #include "contacts-history-view.h"
+#include "contacts-omoko.h"
 
 void
@@ -196 +197 @@
         gint result, count_selected;
         EContact *contact;
-        GList *widgets, *selected_paths, *current_path;
+        GList *selected_paths, *current_path;
         GList *contact_list = NULL;
         const gchar *name;
@@ -242 +243 @@
 
         main_window = data->ui->main_window;
-        dialog = gtk_message_dialog_new (GTK_WINDOW (main_window),
-                                         0, GTK_MESSAGE_QUESTION,
-                                         GTK_BUTTONS_CANCEL,
-                                         message);
-        gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_DELETE,
-                GTK_RESPONSE_YES, NULL);
-
-        widgets = contacts_set_widgets_desensitive (main_window);
+        main_window = data->ui->main_window;
+        dialog = moko_message_dialog_new ();
+        
+        moko_message_dialog_set_message (MOKO_MESSAGE_DIALOG (dialog),
+                                         "%s", message);
+        moko_message_dialog_set_image_from_stock (MOKO_MESSAGE_DIALOG (dialog),
+                                                  GTK_STOCK_DIALOG_QUESTION);
+        
+        gtk_dialog_add_buttons (GTK_DIALOG (dialog), 
+                                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,  
+                                GTK_STOCK_DELETE, GTK_RESPONSE_YES,
+                                NULL);
+
         result = gtk_dialog_run (GTK_DIALOG (dialog));
         switch (result) {
@@ -262 +268 @@
         g_list_free (contact_list);
         gtk_widget_destroy (dialog);
-        contacts_set_widgets_sensitive (widgets);
-        g_list_free (widgets);
 }
 

trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-history.c

@@ -492 +492 @@
      FIXME : MokoJournal should have a special function for this. 
   */
-  g_print ("%s\n", priv->uid);
   gint len = moko_journal_get_nb_entries (priv->journal);
   gint i;
@@ -508 +507 @@
   children = g_list_sort (children, (GCompareFunc)_sort_by_date);
   
+  if (!children) {
+    GtkWidget *label = gtk_label_new ("No communication history");
+    gtk_box_pack_start (GTK_BOX (history), label, TRUE, TRUE, 0);
+    gtk_widget_show_all (GTK_WIDGET (history));
+    return;
+  }
+    
   /* Finally, go through the sorted list creating the widgets and adding them */
   for (c = children; c != NULL; c = c->next) {