2007-07-17 [colin] 2.10.0cvs36

	* src/editaddress.c
		Simplify layout on Maemo
	* src/folder.c
		Fix possible crash
	* src/prefs_display_header.c
		Remove some headers by default on Maemo

diff --git a/ChangeLog b/ChangeLog
index a2aac552c53f5a0e7e00738a2bea9fff9becf0a6..f6d3533fa363397249a56b6c14d2a12766fc9f40 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-07-17 [colin]     2.10.0cvs36
+
+       * src/editaddress.c
+               Simplify layout on Maemo
+       * src/folder.c
+               Fix possible crash
+       * src/prefs_display_header.c
+               Remove some headers by default on Maemo
+
 2007-07-17 [paul]      2.10.0cvs35
 
        * src/prefs_common.c

diff --git a/PATCHSETS b/PATCHSETS
index e4fbd82a593002377a33a1c4c564152c3740b54e..aa0f636fef1fe39c07b0f04e7b3e62cd13ce014a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2689,3 +2689,4 @@
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/edittags.c;  ) > 2.10.0cvs33.patchset
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/edittags.c;  ) > 2.10.0cvs34.patchset
 ( cvs diff -u -r 1.204.2.140 -r 1.204.2.141 src/prefs_common.c;  cvs diff -u -r 1.103.2.86 -r 1.103.2.87 src/prefs_common.h;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/prefs_logging.c;  cvs diff -u -r 1.6.2.13 -r 1.6.2.14 src/common/log.c;  ) > 2.10.0cvs35.patchset
+( cvs diff -u -r 1.14.2.27 -r 1.14.2.28 src/editaddress.c;  cvs diff -u -r 1.213.2.148 -r 1.213.2.149 src/folder.c;  cvs diff -u -r 1.16.2.30 -r 1.16.2.31 src/prefs_display_header.c;  ) > 2.10.0cvs36.patchset

diff --git a/configure.ac b/configure.ac
index cfab82a237d6e7546113be1f13ea9cf481d588d7..d8c49afc500c7e4dc4e07398d2ef0ce62a2cc410 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=35
+EXTRA_VERSION=36
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/editaddress.c b/src/editaddress.c
index d0d5335896dde9f19b0e6cc3758003d94e8d7f13..38c550365f03a2a616bb1c755caa7bc32842d163 100644 (file)
--- a/src/editaddress.c
+++ b/src/editaddress.c
@@ -66,13 +66,25 @@ typedef enum {
 #define EDITPERSON_WIDTH      520
 #define EDITPERSON_HEIGHT     320
 
-#define EMAIL_N_COLS          3
-#define EMAIL_COL_WIDTH_EMAIL 180
-#define EMAIL_COL_WIDTH_ALIAS 80
+#ifndef MAEMO
+# define EMAIL_N_COLS          3
+# define EMAIL_COL_WIDTH_EMAIL 180
+# define EMAIL_COL_WIDTH_ALIAS 80
+#else
+# define EMAIL_N_COLS          1
+# define EMAIL_COL_WIDTH_EMAIL 130
+# define EMAIL_COL_WIDTH_ALIAS 130
+#endif
 
-#define ATTRIB_N_COLS          2
-#define ATTRIB_COL_WIDTH_NAME  120
-#define ATTRIB_COL_WIDTH_VALUE 180
+#ifndef MAEMO
+# define ATTRIB_N_COLS          2
+# define ATTRIB_COL_WIDTH_NAME  240
+# define ATTRIB_COL_WIDTH_VALUE 0
+#else
+# define ATTRIB_N_COLS          2
+# define ATTRIB_COL_WIDTH_NAME  120
+# define ATTRIB_COL_WIDTH_VALUE 120
+#endif
 
 #define PAGE_BASIC             0
 #define PAGE_EMAIL             1
@@ -211,9 +223,10 @@ static void edit_person_load_email( ItemPerson *person ) {
                ItemEMail *email = addritem_copyfull_item_email( emorig );
                gint row;
                text[ EMAIL_COL_EMAIL   ] = email->address;
+#ifndef MAEMO
                text[ EMAIL_COL_ALIAS   ] = email->obj.name;
                text[ EMAIL_COL_REMARKS ] = email->remarks;
-
+#endif
                row = gtk_clist_append( clist, text );
                gtk_clist_set_row_data( clist, row, email );
                node = g_list_next( node );
@@ -354,9 +367,10 @@ static void edit_person_email_add( gpointer data ) {
        if( ! errFlg ) {
                gchar *text[ EMAIL_N_COLS ];
                text[ EMAIL_COL_EMAIL   ] = email->address;
+#ifndef MAEMO
                text[ EMAIL_COL_ALIAS   ] = email->obj.name;
                text[ EMAIL_COL_REMARKS ] = email->remarks;
-
+#endif
                row = gtk_clist_insert( clist, 1 + row, text );
                gtk_clist_set_row_data( clist, row, email );
                gtk_clist_select_row( clist, row, 0 );
@@ -524,7 +538,7 @@ static void edit_person_attrib_add( gpointer data ) {
 
        attrib = edit_person_attrib_edit( &errFlg, NULL );
        if( ! errFlg ) {
-               gchar *text[ EMAIL_N_COLS ];
+               gchar *text[ ATTRIB_N_COLS ];
                text[ ATTRIB_COL_NAME  ] = attrib->name;
                text[ ATTRIB_COL_VALUE ] = attrib->value;
 
@@ -721,7 +735,16 @@ static void addressbook_edit_person_page_basic( gint pageNum, gchar *pageLbl ) {
        top++; \
 }
 
+#define ATTACH_HIDDEN_ROW(text, entry) \
+{ \
+       entry = gtk_entry_new(); \
+}
+
+#ifndef MAEMO
        ATTACH_ROW(_("Display Name"), entry_name);
+#else
+       ATTACH_HIDDEN_ROW(_("Display Name"), entry_name);
+#endif
        locale = conv_get_current_locale();
        if (locale &&
            (!g_ascii_strncasecmp(locale, "ja", 2) ||
@@ -733,9 +756,14 @@ static void addressbook_edit_person_page_basic( gint pageNum, gchar *pageLbl ) {
                ATTACH_ROW(_("First Name"), entry_fn);
                ATTACH_ROW(_("Last Name"), entry_ln);
        }
+#ifndef MAEMO
        ATTACH_ROW(_("Nickname"), entry_nn);
+#else
+       ATTACH_HIDDEN_ROW(_("Nickname"), entry_nn);
+#endif
 
 #undef ATTACH_ROW
+#undef ATTACH_HIDDEN_ROW
 
        gtk_widget_show_all(vbox);
 
@@ -810,9 +838,10 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
        gint i;
 
        titles[ EMAIL_COL_EMAIL   ] = _("Email Address");
+#ifndef MAEMO
        titles[ EMAIL_COL_ALIAS   ] = _("Alias");
        titles[ EMAIL_COL_REMARKS ] = _("Remarks");
-
+#endif
        vbox = gtk_vbox_new( FALSE, 8 );
        gtk_widget_show( vbox );
        gtk_container_add( GTK_CONTAINER( personeditdlg.notebook ), vbox );
@@ -834,12 +863,12 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
        gtk_container_set_border_width( GTK_CONTAINER(vboxl), 4 );
 
        clist_swin = gtk_scrolled_window_new( NULL, NULL );
-       gtk_container_add( GTK_CONTAINER(vboxl), clist_swin );
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(clist_swin),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
 
        clist = gtk_clist_new_with_titles( EMAIL_N_COLS, titles );
+
        gtk_container_add( GTK_CONTAINER(clist_swin), clist );
        gtk_clist_set_selection_mode( GTK_CLIST(clist), GTK_SELECTION_BROWSE );
        gtk_clist_set_column_width( GTK_CLIST(clist), EMAIL_COL_EMAIL, EMAIL_COL_WIDTH_EMAIL );
@@ -850,27 +879,38 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
 
        /* Data entry area */
        table = gtk_table_new( 4, 2, FALSE);
+
+#ifndef MAEMO
+       gtk_container_add( GTK_CONTAINER(vboxl), clist_swin );
+       gtk_box_pack_start(GTK_BOX(vboxl), table, FALSE, FALSE, 0);
+#else
        gtk_box_pack_start(GTK_BOX(vboxl), table, FALSE, FALSE, 0);
+       gtk_container_add( GTK_CONTAINER(vboxl), clist_swin );
+       gtk_clist_column_titles_hide(GTK_CLIST(clist));
+#endif
        gtk_container_set_border_width( GTK_CONTAINER(table), 4 );
        gtk_table_set_row_spacings(GTK_TABLE(table), 4);
        gtk_table_set_col_spacings(GTK_TABLE(table), 4);
 
+       entry_email = gtk_entry_new();
+       entry_alias = gtk_entry_new();
+       entry_remarks = gtk_entry_new();
+
        /* First row */
        top = 0;
        label = gtk_label_new(_("Email Address"));
        gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 
-       entry_email = gtk_entry_new();
        gtk_table_attach(GTK_TABLE(table), entry_email, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
 
+#ifndef MAEMO
        /* Next row */
        ++top;
        label = gtk_label_new(_("Alias"));
        gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 
-       entry_alias = gtk_entry_new();
        gtk_table_attach(GTK_TABLE(table), entry_alias, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
 
        /* Next row */
@@ -879,8 +919,8 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
        gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 
-       entry_remarks = gtk_entry_new();
        gtk_table_attach(GTK_TABLE(table), entry_remarks, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+#endif
 
        /* Button box */
        vboxb = gtk_vbox_new( FALSE, 4 );
@@ -894,18 +934,20 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
 
        /* Buttons */
        buttonUp = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
+       buttonDown = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
+       buttonDel = gtk_button_new_from_stock(GTK_STOCK_DELETE);
+       buttonMod = gtk_button_new_from_stock(GTK_STOCK_SAVE);
+       buttonAdd = gtk_button_new_from_stock(GTK_STOCK_ADD);
+
+#ifndef MAEMO
        gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonUp );
 
-       buttonDown = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
        gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonDown );
-
-       buttonDel = gtk_button_new_from_stock(GTK_STOCK_DELETE);
+#endif
        gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonDel );
 
-       buttonMod = gtk_button_new_from_stock(GTK_STOCK_SAVE);
        gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonMod );
 
-       buttonAdd = gtk_button_new_from_stock(GTK_STOCK_ADD);
        gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonAdd );
 
        gtk_widget_show_all(vbox);
@@ -1027,7 +1069,6 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl )
        gtk_container_set_border_width( GTK_CONTAINER(vboxl), 4 );
 
        clist_swin = gtk_scrolled_window_new( NULL, NULL );
-       gtk_container_add( GTK_CONTAINER(vboxl), clist_swin );
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(clist_swin),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
@@ -1035,23 +1076,32 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl )
        clist = gtk_clist_new_with_titles( ATTRIB_N_COLS, titles );
        gtk_container_add( GTK_CONTAINER(clist_swin), clist );
        gtk_clist_set_selection_mode( GTK_CLIST(clist), GTK_SELECTION_BROWSE );
-       gtk_clist_set_column_width( GTK_CLIST(clist), ATTRIB_COL_NAME, ATTRIB_COL_WIDTH_NAME );
-       gtk_clist_set_column_width( GTK_CLIST(clist), ATTRIB_COL_VALUE, ATTRIB_COL_WIDTH_VALUE );
        gtk_clist_set_compare_func( GTK_CLIST(clist), edit_person_attrib_compare_func );
        gtk_clist_set_auto_sort( GTK_CLIST(clist), TRUE );
+       gtk_clist_set_column_width( GTK_CLIST(clist), ATTRIB_COL_NAME, ATTRIB_COL_WIDTH_NAME );
+       gtk_clist_set_column_width( GTK_CLIST(clist), ATTRIB_COL_VALUE, ATTRIB_COL_WIDTH_VALUE );
 
        for( i = 0; i < ATTRIB_N_COLS; i++ )
                GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(clist)->column[i].button, GTK_CAN_FOCUS);
 
        /* Data entry area */
+#ifndef MAEMO
        table = gtk_table_new( 4, 2, FALSE);
+       gtk_container_add( GTK_CONTAINER(vboxl), clist_swin );
+       gtk_box_pack_start(GTK_BOX(vboxl), table, FALSE, FALSE, 0);
+#else
+       table = gtk_table_new( 2, 4, FALSE);
        gtk_box_pack_start(GTK_BOX(vboxl), table, FALSE, FALSE, 0);
+       gtk_container_add( GTK_CONTAINER(vboxl), clist_swin );
+       gtk_clist_column_titles_hide(GTK_CLIST(clist));
+#endif
        gtk_container_set_border_width( GTK_CONTAINER(table), 4 );
        gtk_table_set_row_spacings(GTK_TABLE(table), 4);
        gtk_table_set_col_spacings(GTK_TABLE(table), 4);
 
        /* First row */
        top = 0;
+#ifndef MAEMO
        label = gtk_label_new(_("Name"));
        gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
@@ -1067,7 +1117,23 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl )
 
        entry_value = gtk_entry_new();
        gtk_table_attach(GTK_TABLE(table), entry_value, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+#else
+       label = gtk_label_new(_("Name"));
+       gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
+       gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 
+       entry_name = gtk_entry_new();
+       gtk_table_attach(GTK_TABLE(table), entry_name, 1, 2, 0, 1, GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+
+       /* Next row */
+       ++top;
+       label = gtk_label_new(_("Value"));
+       gtk_table_attach(GTK_TABLE(table), label, 2, 3, 0, 1, GTK_FILL, 0, 0, 0);
+       gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+
+       entry_value = gtk_entry_new();
+       gtk_table_attach(GTK_TABLE(table), entry_value, 3, 4, 0, 1, GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+#endif
        /* Button box */
        vboxb = gtk_vbox_new( FALSE, 4 );
        gtk_box_pack_start(GTK_BOX(hbox), vboxb, FALSE, FALSE, 2);
@@ -1244,7 +1310,17 @@ static gboolean addressbook_edit_person_close( gboolean cancelled )
                return FALSE;
        }
 
+#ifndef MAEMO
        cn = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_name), 0, -1 );
+#else
+       {
+               gchar *first = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_first), 0, -1 );
+               gchar *last = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_last), 0, -1 );
+               cn = g_strdup_printf("%s%s%s", first, (first && last && *first && *last)?" ":"", last);
+               g_free(first);
+               g_free(last);
+       }
+#endif
        if( current_person && current_abf ) {
                /* Update email/attribute list for existing current_person */
                addrbook_update_address_list( current_abf, current_person, listEMail );

diff --git a/src/folder.c b/src/folder.c
index 632aaf008310d56fdd7d1534ab24442b96628d65..a2068e79caff63bf802c42631268692145dffddc 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -215,6 +215,9 @@ void folder_item_change_type(FolderItem *item, SpecialFolderItemType newtype)
        Folder *folder = NULL;
        FolderUpdateData hookdata;
 
+       if (item == NULL)
+               return;
+
        folder = item->folder;
        /* unset previous root of newtype */
        switch(newtype) {

diff --git a/src/prefs_display_header.c b/src/prefs_display_header.c
index 1e9592429a251e7a052fd988f02875d272319f02..803f0b81b02b5a980eba6b132f8475ef089df2da 100644 (file)
--- a/src/prefs_display_header.c
+++ b/src/prefs_display_header.c
@@ -111,6 +111,7 @@ static void drag_end        (GtkTreeView *list_view,
                         GdkDragContext *context,
                         gpointer data);
 
+#ifndef MAEMO
 static gchar *defaults[] =
 {
        "From",
@@ -139,7 +140,36 @@ static gchar *defaults[] =
        "-Priority",
        "-X-Face"
 };
-
+#else
+static gchar *defaults[] =
+{
+       "From",
+       "To",
+       "Cc",
+       "Subject",
+       "Date", 
+       "Newsgroups",
+       "Followup-To",
+       "-Reply-To",
+       "-Sender",
+       "-User-Agent",
+       "-X-Mailer",    
+       "-Organization",
+       "-X-Newsreader",
+       "-Received",
+       "-Message-ID",
+       "-In-Reply-To",
+       "-References",
+       "-Mime-Version",
+       "-Content-Type",
+       "-Content-Transfer-Encoding",
+       "-X-UIDL",
+       "-Precedence",
+       "-Status",
+       "-Priority",
+       "-X-Face"
+};
+#endif
 static void prefs_display_header_set_default(void)
 {
        gint i;