2008-01-08 [colin] 3.2.0cvs33

	* src/main.c
		Maemo: connect HW status change signal for shutdown
	* src/mainwindow.c
		Maemo: Fix hardware space key
	* src/wizard.c
		Maemo: name mmc1 and 2 a better name

diff --git a/ChangeLog b/ChangeLog
index d9df51696aefc93480b2e1dd8a33360dce8ba487..52fbfbdae07204680024f403a0f64b062f27b119 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-01-08 [colin]     3.2.0cvs33
+
+       * src/main.c
+               Maemo: connect HW status change signal for shutdown
+       * src/mainwindow.c
+               Maemo: Fix hardware space key
+       * src/wizard.c
+               Maemo: name mmc1 and 2 a better name
+

 2008-01-08 [wwp]       3.2.0cvs32
 
        * src/folder.c
 2008-01-08 [wwp]       3.2.0cvs32
 
        * src/folder.c

diff --git a/PATCHSETS b/PATCHSETS
index e5f99ddab2034610f38b08cf6251639ff6043a79..88357c2b30189e044a929bf11714a3e924e48cad 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3169,3 +3169,4 @@
 ( cvs diff -u -r 1.395.2.347 -r 1.395.2.348 src/summaryview.c;  ) > 3.2.0cvs30.patchset
 ( cvs diff -u -r 1.36.2.131 -r 1.36.2.132 src/common/utils.c;  ) > 3.2.0cvs31.patchset
 ( cvs diff -u -r 1.213.2.173 -r 1.213.2.174 src/folder.c;  cvs diff -u -r 1.2.2.25 -r 1.2.2.26 src/folder_item_prefs.c;  cvs diff -u -r 1.2.2.13 -r 1.2.2.14 src/folder_item_prefs.h;  cvs diff -u -r 1.52.2.54 -r 1.52.2.55 src/prefs_folder_item.c;  ) > 3.2.0cvs32.patchset
 ( cvs diff -u -r 1.395.2.347 -r 1.395.2.348 src/summaryview.c;  ) > 3.2.0cvs30.patchset
 ( cvs diff -u -r 1.36.2.131 -r 1.36.2.132 src/common/utils.c;  ) > 3.2.0cvs31.patchset
 ( cvs diff -u -r 1.213.2.173 -r 1.213.2.174 src/folder.c;  cvs diff -u -r 1.2.2.25 -r 1.2.2.26 src/folder_item_prefs.c;  cvs diff -u -r 1.2.2.13 -r 1.2.2.14 src/folder_item_prefs.h;  cvs diff -u -r 1.52.2.54 -r 1.52.2.55 src/prefs_folder_item.c;  ) > 3.2.0cvs32.patchset

+( cvs diff -u -r 1.115.2.179 -r 1.115.2.180 src/main.c;  cvs diff -u -r 1.274.2.227 -r 1.274.2.228 src/mainwindow.c;  cvs diff -u -r 1.1.2.65 -r 1.1.2.66 src/wizard.c;  ) > 3.2.0cvs33.patchset

diff --git a/configure.ac b/configure.ac
index e03c757907710a3aa0b23a544f5670e3a63b6470..2a63cd466adee5c4f534e015f3b92ea79692ce0f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=32
+EXTRA_VERSION=33

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/main.c b/src/main.c
index a26e3256f82c1d8de7d9b79c73f28753a10607c7..319b0f1c585b9b61df1b45b1dc19a596d77bf401 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -236,6 +236,19 @@ void exit_event_handler(gboolean die_now, gpointer data)
 
 }
 
 
 }
 

+/* Callback for hardware D-BUS events */
+void hw_event_handler(osso_hw_state_t *state, gpointer data)
+{
+       AppData *appdata;
+       appdata = (AppData *) data;
+
+       if (state->shutdown_ind) {
+               exit_claws(static_mainwindow);
+               hildon_banner_show_information(GTK_WIDGET(appdata->window), NULL,
+                       _("Exiting..."));
+       }
+}
+

 /* Callback for normal D-BUS messages */
 gint dbus_req_handler(const gchar * interface, const gchar * method,
                       GArray * arguments, gpointer data,
 /* Callback for normal D-BUS messages */
 gint dbus_req_handler(const gchar * interface, const gchar * method,
                       GArray * arguments, gpointer data,


@@ -1116,6 +1129,8 @@ int main(int argc, char *argv[])
                return OSSO_ERROR;
        }
 #endif
                return OSSO_ERROR;
        }
 #endif

+       osso_hw_set_event_cb( appdata->osso_context,
+                               NULL, hw_event_handler, (gpointer) appdata );

 #endif
        manage_window_focus_in(mainwin->window, NULL, NULL);
        folderview = mainwin->folderview;
 #endif
        manage_window_focus_in(mainwin->window, NULL, NULL);
        folderview = mainwin->folderview;

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 581a67b4f75b7c4cb048e874a1f005c67615b6b5..cdb7a3622023998fa3af0f24852279bba6ce419d 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1379,14 +1379,16 @@ static gboolean mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event,
                app_exit_cb(mainwin, 0, NULL);
                return FALSE;
        case GDK_space:
                app_exit_cb(mainwin, 0, NULL);
                return FALSE;
        case GDK_space:

-               if (mainwin->folderview && mainwin->summaryview
-                   && ((!mainwin->summaryview->displayed
-                       && !mainwin->summaryview->selected) 
-                       || (mainwin->summaryview->folder_item
-                           && mainwin->summaryview->folder_item->total_msgs == 0))) {
-                       g_signal_stop_emission_by_name(G_OBJECT(widget), 
-                                       "key_press_event");
-                       folderview_select_next_unread(mainwin->folderview, TRUE);
+               if (gtk_window_is_active(GTK_WINDOW(mainwin->window))) {
+                       if (mainwin->folderview && mainwin->summaryview
+                           && ((!mainwin->summaryview->displayed
+                               && !mainwin->summaryview->selected) 
+                               || (mainwin->summaryview->folder_item
+                                   && mainwin->summaryview->folder_item->total_msgs == 0))) {
+                               g_signal_stop_emission_by_name(G_OBJECT(widget), 
+                                              "key_press_event");
+                               folderview_select_next_unread(mainwin->folderview, TRUE);
+                       }

                }
                break;
 #ifdef MAEMO
                }
                break;
 #ifdef MAEMO

diff --git a/src/wizard.c b/src/wizard.c
index f87d0fd7efd70e2a696a8b732ec17baf51562004..97465473afc6bdc5406d67f76d9982cbbed5a866 100644 (file)
--- a/src/wizard.c
+++ b/src/wizard.c
@@ -1095,10 +1095,10 @@ static GtkWidget* mailbox_page (WizardWindow * wizard)
                _("on internal memory"));
        wizard->data_root_mmc1_radiobtn = gtk_radio_button_new_with_label_from_widget(
                GTK_RADIO_BUTTON(wizard->data_root_nokia_radiobtn),
                _("on internal memory"));
        wizard->data_root_mmc1_radiobtn = gtk_radio_button_new_with_label_from_widget(
                GTK_RADIO_BUTTON(wizard->data_root_nokia_radiobtn),

-               _("on /media/mmc1"));
+               _("on external memory card"));

        wizard->data_root_mmc2_radiobtn = gtk_radio_button_new_with_label_from_widget(
                GTK_RADIO_BUTTON(wizard->data_root_nokia_radiobtn),
        wizard->data_root_mmc2_radiobtn = gtk_radio_button_new_with_label_from_widget(
                GTK_RADIO_BUTTON(wizard->data_root_nokia_radiobtn),

-               _("on /media/mmc2"));
+               _("on internal memory card"));

                
        g_signal_connect(G_OBJECT(wizard->data_root_nokia_radiobtn), "toggled",
                         G_CALLBACK(data_root_changed), wizard);
                
        g_signal_connect(G_OBJECT(wizard->data_root_nokia_radiobtn), "toggled",
                         G_CALLBACK(data_root_changed), wizard);


@@ -1126,6 +1126,8 @@ static GtkWidget* mailbox_page (WizardWindow * wizard)
        if (wizard->vol_mmc2 == NULL || !gnome_vfs_volume_is_mounted(wizard->vol_mmc2)
            || strcmp(mount_path, MMC2_PATH)) {
                gtk_widget_set_sensitive(wizard->data_root_mmc2_radiobtn, FALSE);
        if (wizard->vol_mmc2 == NULL || !gnome_vfs_volume_is_mounted(wizard->vol_mmc2)
            || strcmp(mount_path, MMC2_PATH)) {
                gtk_widget_set_sensitive(wizard->data_root_mmc2_radiobtn, FALSE);

+       } else
+               gtk_toggle_button_set_active(wizard->data_root_mmc2_radiobtn, TRUE);

        }
        g_free(mount_path);
        
        }
        g_free(mount_path);