sync check for 0.4.99claws3

diff --git a/ChangeLog.claws b/ChangeLog.claws
index fbcc09f874dfd28d9a26c846f128e6625882cae3..3d807d25b819f26b1fb7ab7cc866f32b7852ee82 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2001-05-28 [alfons]
+
+       Verified the sync for src/prefs_common.[ch] and
+       src/prefs_account.[ch]. I believe there were some
+       minor indentation differences.
+

 2001-05-28 [paul]
 
         0.4.99claws3
 2001-05-28 [paul]
 
         0.4.99claws3

diff --git a/src/prefs_account.c b/src/prefs_account.c
index a132a6bde1192422ca266500a1f2755ab7eafa85..19acf638a00b0ac96b688ec2e868b61e62e10bd7 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -702,10 +702,6 @@ static void prefs_account_basic_create(void)
        SET_ACTIVATE (menuitem);
        MENUITEM_ADD (optmenu_menu, menuitem, _("None (local)"), A_LOCAL);
        SET_ACTIVATE (menuitem);
        SET_ACTIVATE (menuitem);
        MENUITEM_ADD (optmenu_menu, menuitem, _("None (local)"), A_LOCAL);
        SET_ACTIVATE (menuitem);

-       /*
-       MENUITEM_ADD (optmenu_menu, menuitem, _("Local (without SMTP server)"), A_LOCAL_CMD);
-       SET_ACTIVATE (menuitem);
-       */

 
        gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), optmenu_menu);
 
 
        gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), optmenu_menu);
 


@@ -1296,7 +1292,6 @@ static void prefs_account_edit_custom_header(void)
 }
 
 #if USE_GPGME
 }
 
 #if USE_GPGME

-

 static void prefs_account_sign_key_set_data_from_radiobtn(PrefParam *pparam)
 {
        GtkRadioButton *radiobtn;
 static void prefs_account_sign_key_set_data_from_radiobtn(PrefParam *pparam)
 {
        GtkRadioButton *radiobtn;

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 23bb665567cfc03837b0cd83d6daa41444b6913a..fa39f40c6e9acfc705370f5deb084cea1da1d810 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -100,7 +100,6 @@ static struct Compose {
 } compose;
 
 static struct Display {
 } compose;
 
 static struct Display {

-

        GtkWidget *entry_textfont;
        GtkWidget *button_textfont;
 
        GtkWidget *entry_textfont;
        GtkWidget *button_textfont;
 


@@ -1422,7 +1421,6 @@ static void prefs_display_create(void)
        GtkWidget *hbox1;
        GtkWidget *label_datefmt;
        GtkWidget *label_datefmt_btn;
        GtkWidget *hbox1;
        GtkWidget *label_datefmt;
        GtkWidget *label_datefmt_btn;

-       GtkWidget *button_dispitem;

        GtkWidget *tmplabel, *tmpentry, *tmpbutton;
        GtkWidget *entry_datefmt;
        GtkTooltips *tooltips_datefmt;
        GtkWidget *tmplabel, *tmpentry, *tmpbutton;
        GtkWidget *entry_datefmt;
        GtkTooltips *tooltips_datefmt;


@@ -1594,7 +1592,7 @@ static void prefs_message_create(void)
        GtkWidget *chkbtn_mbalnum;
        GtkWidget *chkbtn_disphdrpane;
        GtkWidget *chkbtn_disphdr;
        GtkWidget *chkbtn_mbalnum;
        GtkWidget *chkbtn_disphdrpane;
        GtkWidget *chkbtn_disphdr;

-       GtkWidget *button_edit_disphdr; 
+       GtkWidget *button_edit_disphdr;

        GtkWidget *hbox_linespc;
        GtkWidget *label_linespc;
        GtkObject *spinbtn_linespc_adj;
        GtkWidget *hbox_linespc;
        GtkWidget *label_linespc;
        GtkObject *spinbtn_linespc_adj;


@@ -2129,7 +2127,7 @@ static void prefs_quote_colors_dialog_create(void)
        gtk_widget_set_usize (color_buttons.quote_level3_btn, 40, 30);
        gtk_container_set_border_width
                (GTK_CONTAINER (color_buttons.quote_level3_btn), 5);
        gtk_widget_set_usize (color_buttons.quote_level3_btn, 40, 30);
        gtk_container_set_border_width
                (GTK_CONTAINER (color_buttons.quote_level3_btn), 5);

-               
+

        color_buttons.uri_btn = gtk_button_new_with_label ("");
        gtk_table_attach (GTK_TABLE (table), color_buttons.uri_btn,
                          0, 1, 3, 4, 0, 0, 0, 0);
        color_buttons.uri_btn = gtk_button_new_with_label ("");
        gtk_table_attach (GTK_TABLE (table), color_buttons.uri_btn,
                          0, 1, 3, 4, 0, 0, 0, 0);


@@ -2681,7 +2679,7 @@ static void prefs_common_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                     gpointer data)
 {
        if (event && event->keyval == GDK_Escape)
                                     gpointer data)
 {
        if (event && event->keyval == GDK_Escape)

-               prefs_common_cancel();  
+               prefs_common_cancel();

 }
 
 static void prefs_common_ok(void)
 }
 
 static void prefs_common_ok(void)