2005-12-12 [paul] 1.9.100cvs83

	* src/browseldap.c
	* src/foldersel.c
	* src/prefs_actions.c
	* src/prefs_filtering.c
	* src/prefs_matcher.c
	* src/prefs_spelling.glade 	** REMOVED **
	* src/prefs_template.c
	* src/gtk/foldersort.glade	** REMOVED **
	* src/gtk/pluginwindow.c
	* src/gtk/pluginwindow.glade	** REMOVED **
	* src/plugins/spamassassin/spamassassin_gtk.glade	** REMOVED **
		cleanups

diff --git a/ChangeLog b/ChangeLog
index a02604a8148de0a42b2d6e58194222cc033ec29f..11923fc6a5fd84ee735839f9269c53105ca7e93c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2005-12-12 [paul]      1.9.100cvs83
+
+       * src/browseldap.c
+       * src/foldersel.c
+       * src/prefs_actions.c
+       * src/prefs_filtering.c
+       * src/prefs_matcher.c
+       * src/prefs_spelling.glade      ** REMOVED **
+       * src/prefs_template.c
+       * src/gtk/foldersort.glade      ** REMOVED **
+       * src/gtk/pluginwindow.c
+       * src/gtk/pluginwindow.glade    ** REMOVED **
+       * src/plugins/spamassassin/spamassassin_gtk.glade       ** REMOVED **
+               cleanups
+

 2005-12-11 [paul]      1.9.100cvs82
 
        * src/gtk/filesel.c
 2005-12-11 [paul]      1.9.100cvs82
 
        * src/gtk/filesel.c

diff --git a/PATCHSETS b/PATCHSETS
index ab29d681097ecb28dc25324e51514429504a3a49..725fbc1477806da6ad205b13d87e4265f9f7909c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1066,3 +1066,4 @@
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/pgpcore/passphrase.c;  ) > 1.9.100cvs80.patchset
 ( cvs diff -u -r 1.53.2.15 -r 1.53.2.16 po/POTFILES.in;  cvs diff -u -r 1.274.2.80 -r 1.274.2.81 src/mainwindow.c;  cvs diff -u -r 1.11.2.4 -r 1.11.2.5 src/manual.c;  cvs diff -u -r 1.20.2.6 -r 1.20.2.7 src/gtk/Makefile.am;  diff -u /dev/null src/gtk/icon_legend.c;  diff -u /dev/null src/gtk/icon_legend.h;  ) > 1.9.100cvs81.patchset
 ( cvs diff -u -r 1.2.2.17 -r 1.2.2.18 src/gtk/filesel.c;  ) > 1.9.100cvs82.patchset
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/pgpcore/passphrase.c;  ) > 1.9.100cvs80.patchset
 ( cvs diff -u -r 1.53.2.15 -r 1.53.2.16 po/POTFILES.in;  cvs diff -u -r 1.274.2.80 -r 1.274.2.81 src/mainwindow.c;  cvs diff -u -r 1.11.2.4 -r 1.11.2.5 src/manual.c;  cvs diff -u -r 1.20.2.6 -r 1.20.2.7 src/gtk/Makefile.am;  diff -u /dev/null src/gtk/icon_legend.c;  diff -u /dev/null src/gtk/icon_legend.h;  ) > 1.9.100cvs81.patchset
 ( cvs diff -u -r 1.2.2.17 -r 1.2.2.18 src/gtk/filesel.c;  ) > 1.9.100cvs82.patchset

+( cvs diff -u -r 1.2.4.10 -r 1.2.4.11 src/browseldap.c;  cvs diff -u -r 1.26.2.21 -r 1.26.2.22 src/foldersel.c;  cvs diff -u -r 1.60.2.26 -r 1.60.2.27 src/prefs_actions.c;  cvs diff -u -r 1.59.2.27 -r 1.59.2.28 src/prefs_filtering.c;  cvs diff -u -r 1.43.2.29 -r 1.43.2.30 src/prefs_matcher.c;  cvs diff -u -r -1.2 -r -1.3 src/prefs_spelling.glade;  cvs diff -u -r 1.12.2.18 -r 1.12.2.19 src/prefs_template.c;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/gtk/foldersort.glade;  cvs diff -u -r 1.5.2.20 -r 1.5.2.21 src/gtk/pluginwindow.c;  cvs diff -u -r -1.1 -r -1.2 src/gtk/pluginwindow.glade;  cvs diff -u -r -1.2.2.1 -r -1.2.2.2 src/plugins/spamassassin/spamassassin_gtk.glade;  ) > 1.9.100cvs83.patchset

diff --git a/configure.ac b/configure.ac
index 06de46435a48d543d321c963b2cf00a37c94c133..5ad986a2a871dfec58f6b470f60d203e82d7abf1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=82
+EXTRA_VERSION=83

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/browseldap.c b/src/browseldap.c
index 70d578a264812ef24c22b23f543b97f2348411dc..847c462c96ae6d7989df13c243c9d8109ab584c6 100644 (file)
--- a/src/browseldap.c
+++ b/src/browseldap.c
@@ -211,7 +211,6 @@ static void browse_create( void ) {
        GtkWidget *tree_win;
        GtkWidget *hbbox;
        GtkWidget *close_btn;
        GtkWidget *tree_win;
        GtkWidget *hbbox;
        GtkWidget *close_btn;

-       GtkWidget *hsbox;

        gint top;
 
        window = gtk_dialog_new();
        gint top;
 
        window = gtk_dialog_new();

diff --git a/src/foldersel.c b/src/foldersel.c
index 1af72d5c58cfbb60e0a2bcad150c519cf5cfdb25..626b4037847214d291cb7c9abe1eb30428d16dd4 100644 (file)
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -302,9 +302,9 @@ static void foldersel_create(void)
                         G_CALLBACK(foldersel_entry_activated), NULL);
 
        gtkut_stock_button_set_create(&confirm_area,
                         G_CALLBACK(foldersel_entry_activated), NULL);
 
        gtkut_stock_button_set_create(&confirm_area,

+                                     &new_button,    GTK_STOCK_NEW,

                                      &ok_button,     GTK_STOCK_OK,
                                      &ok_button,     GTK_STOCK_OK,

-                                     &cancel_button, GTK_STOCK_CANCEL,
-                                     &new_button,    GTK_STOCK_NEW);
+                                     &cancel_button, GTK_STOCK_CANCEL);

 
        gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
        gtk_widget_grab_default(ok_button);
 
        gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
        gtk_widget_grab_default(ok_button);

diff --git a/src/gtk/foldersort.glade b/src/gtk/foldersort.glade
deleted file mode 100644 (file)
index 849c07e..0000000
--- a/src/gtk/foldersort.glade
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Sylpheed-Claws</name>
-  <program_name>sylpheed-claws</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>False</gnome_support>
-  <gettext_support>True</gettext_support>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>window</name>
-  <border_width>4</border_width>
-  <title>Set folder sortorder</title>
-  <type>GTK_WINDOW_DIALOG</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>True</modal>
-  <default_width>400</default_width>
-  <default_height>300</default_height>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkTable</class>
-    <name>table1</name>
-    <rows>3</rows>
-    <columns>2</columns>
-    <homogeneous>False</homogeneous>
-    <row_spacing>4</row_spacing>
-    <column_spacing>4</column_spacing>
-
-    <widget>
-      <class>GtkLabel</class>
-      <name>label1</name>
-      <label>Move folders up or down to change
-the sort order in the folderview</label>
-      <justify>GTK_JUSTIFY_LEFT</justify>
-      <wrap>False</wrap>
-      <xalign>0</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-      <child>
-       <left_attach>0</left_attach>
-       <right_attach>1</right_attach>
-       <top_attach>0</top_attach>
-       <bottom_attach>1</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>False</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>False</yfill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <name>hbuttonbox1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>0</spacing>
-      <child_min_width>0</child_min_width>
-      <child_min_height>0</child_min_height>
-      <child_ipad_x>0</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-       <left_attach>0</left_attach>
-       <right_attach>1</right_attach>
-       <top_attach>2</top_attach>
-       <bottom_attach>3</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>False</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>False</yfill>
-      </child>
-
-      <widget>
-       <class>GtkButton</class>
-       <name>ok_btn</name>
-       <can_default>True</can_default>
-       <can_focus>True</can_focus>
-       <label>Ok</label>
-       <relief>GTK_RELIEF_NORMAL</relief>
-      </widget>
-
-      <widget>
-       <class>GtkButton</class>
-       <name>cancel_btn</name>
-       <can_default>True</can_default>
-       <can_focus>True</can_focus>
-       <label>Cancel</label>
-       <relief>GTK_RELIEF_NORMAL</relief>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>vbox1</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-       <left_attach>1</left_attach>
-       <right_attach>2</right_attach>
-       <top_attach>1</top_attach>
-       <bottom_attach>2</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>False</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>True</yfill>
-      </child>
-
-      <widget>
-       <class>GtkButton</class>
-       <name>moveup_btn</name>
-       <can_focus>True</can_focus>
-       <relief>GTK_RELIEF_NORMAL</relief>
-       <child>
-         <padding>0</padding>
-         <expand>False</expand>
-         <fill>False</fill>
-       </child>
-
-       <widget>
-         <class>GtkArrow</class>
-         <name>arrow1</name>
-         <arrow_type>GTK_ARROW_UP</arrow_type>
-         <shadow_type>GTK_SHADOW_OUT</shadow_type>
-         <xalign>0.5</xalign>
-         <yalign>0.5</yalign>
-         <xpad>0</xpad>
-         <ypad>0</ypad>
-       </widget>
-      </widget>
-
-      <widget>
-       <class>GtkButton</class>
-       <name>movedown_btn</name>
-       <can_focus>True</can_focus>
-       <relief>GTK_RELIEF_NORMAL</relief>
-       <child>
-         <padding>0</padding>
-         <expand>False</expand>
-         <fill>False</fill>
-       </child>
-
-       <widget>
-         <class>GtkArrow</class>
-         <name>arrow2</name>
-         <arrow_type>GTK_ARROW_DOWN</arrow_type>
-         <shadow_type>GTK_SHADOW_OUT</shadow_type>
-         <xalign>0.5</xalign>
-         <yalign>0.5</yalign>
-         <xpad>0</xpad>
-         <ypad>0</ypad>
-       </widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkScrolledWindow</class>
-      <name>scrolledwindow1</name>
-      <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-      <vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
-      <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-      <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-      <child>
-       <left_attach>0</left_attach>
-       <right_attach>1</right_attach>
-       <top_attach>1</top_attach>
-       <bottom_attach>2</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>True</xexpand>
-       <yexpand>True</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>True</yfill>
-      </child>
-
-      <widget>
-       <class>GtkCList</class>
-       <name>folderlist</name>
-       <can_focus>True</can_focus>
-       <columns>1</columns>
-       <column_widths>80</column_widths>
-       <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-       <show_titles>True</show_titles>
-       <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-       <widget>
-         <class>GtkLabel</class>
-         <child_name>CList:title</child_name>
-         <name>label2</name>
-         <label>Folders</label>
-         <justify>GTK_JUSTIFY_LEFT</justify>
-         <wrap>False</wrap>
-         <xalign>0</xalign>
-         <yalign>0.5</yalign>
-         <xpad>0</xpad>
-         <ypad>0</ypad>
-       </widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>

diff --git a/src/gtk/pluginwindow.c b/src/gtk/pluginwindow.c
index f72b7b27da4e290c1cd682b5c1e06c43bb2032cf..08d63dd8448b57916cf16e63712a94ec230df21f 100644 (file)
--- a/src/gtk/pluginwindow.c
+++ b/src/gtk/pluginwindow.c
@@ -292,7 +292,7 @@ void pluginwindow_create()
                                  GTK_BUTTONBOX_END);
        gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbuttonbox1), 6);
 
                                  GTK_BUTTONBOX_END);
        gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbuttonbox1), 6);
 

-       load_btn = gtk_button_new_with_label(_("Load Plugin"));
+       load_btn = gtk_button_new_with_label(_("Load Plugin..."));

        gtk_widget_show(load_btn);
        gtk_container_add(GTK_CONTAINER(hbuttonbox1), load_btn);
        GTK_WIDGET_SET_FLAGS(load_btn, GTK_CAN_DEFAULT);
        gtk_widget_show(load_btn);
        gtk_container_add(GTK_CONTAINER(hbuttonbox1), load_btn);
        GTK_WIDGET_SET_FLAGS(load_btn, GTK_CAN_DEFAULT);

diff --git a/src/gtk/pluginwindow.glade b/src/gtk/pluginwindow.glade
deleted file mode 100644 (file)
index 418e38f..0000000
--- a/src/gtk/pluginwindow.glade
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>sylpheed-claws</name>
-  <program_name>sylpheed-claws</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>False</gnome_support>
-  <gettext_support>True</gettext_support>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>pluginwindow</name>
-  <border_width>8</border_width>
-  <title>Plugins</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_CENTER</position>
-  <modal>True</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkVBox</class>
-    <name>vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>4</spacing>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox2</name>
-      <homogeneous>False</homogeneous>
-      <spacing>8</spacing>
-      <child>
-       <padding>0</padding>
-       <expand>True</expand>
-       <fill>True</fill>
-      </child>
-
-      <widget>
-       <class>GtkScrolledWindow</class>
-       <name>scrolledwindow2</name>
-       <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy>
-       <vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
-       <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-       <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-       <child>
-         <padding>0</padding>
-         <expand>True</expand>
-         <fill>True</fill>
-       </child>
-
-       <widget>
-         <class>GtkCList</class>
-         <name>plugins_list</name>
-         <can_focus>True</can_focus>
-         <columns>1</columns>
-         <column_widths>80</column_widths>
-         <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-         <show_titles>True</show_titles>
-         <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-         <widget>
-           <class>GtkLabel</class>
-           <child_name>CList:title</child_name>
-           <name>label12</name>
-           <label>Plugins</label>
-           <justify>GTK_JUSTIFY_LEFT</justify>
-           <wrap>False</wrap>
-           <xalign>0</xalign>
-           <yalign>0.5</yalign>
-           <xpad>0</xpad>
-           <ypad>0</ypad>
-         </widget>
-       </widget>
-      </widget>
-
-      <widget>
-       <class>GtkVBox</class>
-       <name>vbox2</name>
-       <homogeneous>False</homogeneous>
-       <spacing>0</spacing>
-       <child>
-         <padding>0</padding>
-         <expand>True</expand>
-         <fill>True</fill>
-       </child>
-
-       <widget>
-         <class>GtkFrame</class>
-         <name>frame2</name>
-         <label_xalign>0</label_xalign>
-         <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-         <child>
-           <padding>0</padding>
-           <expand>False</expand>
-           <fill>True</fill>
-         </child>
-
-         <widget>
-           <class>GtkLabel</class>
-           <name>label13</name>
-           <label>Description</label>
-           <justify>GTK_JUSTIFY_CENTER</justify>
-           <wrap>False</wrap>
-           <xalign>0</xalign>
-           <yalign>0.5</yalign>
-           <xpad>2</xpad>
-           <ypad>2</ypad>
-         </widget>
-       </widget>
-
-       <widget>
-         <class>GtkScrolledWindow</class>
-         <name>scrolledwindow3</name>
-         <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy>
-         <vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
-         <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-         <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-         <child>
-           <padding>0</padding>
-           <expand>True</expand>
-           <fill>True</fill>
-         </child>
-
-         <widget>
-           <class>GtkText</class>
-           <name>plugin_desc</name>
-           <can_focus>True</can_focus>
-           <editable>False</editable>
-           <text></text>
-         </widget>
-       </widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <name>hbuttonbox1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>0</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-       <padding>0</padding>
-       <expand>False</expand>
-       <fill>False</fill>
-      </child>
-
-      <widget>
-       <class>GtkButton</class>
-       <name>load_btn</name>
-       <can_default>True</can_default>
-       <can_focus>True</can_focus>
-       <label>Load Plugin</label>
-       <relief>GTK_RELIEF_NORMAL</relief>
-      </widget>
-
-      <widget>
-       <class>GtkButton</class>
-       <name>unload_btn</name>
-       <can_default>True</can_default>
-       <can_focus>True</can_focus>
-       <label>Unload Plugin</label>
-       <relief>GTK_RELIEF_NORMAL</relief>
-      </widget>
-
-      <widget>
-       <class>GtkButton</class>
-       <name>close_btn</name>
-       <can_default>True</can_default>
-       <can_focus>True</can_focus>
-       <label>Close</label>
-       <relief>GTK_RELIEF_NORMAL</relief>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>

diff --git a/src/plugins/spamassassin/spamassassin_gtk.glade b/src/plugins/spamassassin/spamassassin_gtk.glade
deleted file mode 100644 (file)
index 4bc74c3..0000000
--- a/src/plugins/spamassassin/spamassassin_gtk.glade
+++ /dev/null
@@ -1,558 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>sylpheed-claws</name>
-  <program_name>sylpheed-claws</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>False</gnome_support>
-  <gettext_support>True</gettext_support>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>spamassassin</name>
-  <title>spamassassin</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkTable</class>
-    <name>table</name>
-    <border_width>8</border_width>
-    <rows>6</rows>
-    <columns>3</columns>
-    <homogeneous>False</homogeneous>
-    <row_spacing>4</row_spacing>
-    <column_spacing>8</column_spacing>
-
-    <widget>
-      <class>GtkLabel</class>
-      <name>label3</name>
-      <label>Transport</label>
-      <justify>GTK_JUSTIFY_CENTER</justify>
-      <wrap>False</wrap>
-      <xalign>0</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-      <child>
-       <left_attach>0</left_attach>
-       <right_attach>1</right_attach>
-       <top_attach>0</top_attach>
-       <bottom_attach>1</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>False</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>False</yfill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <name>label4</name>
-      <label>spamd </label>
-      <justify>GTK_JUSTIFY_CENTER</justify>
-      <wrap>False</wrap>
-      <xalign>0</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-      <child>
-       <left_attach>0</left_attach>
-       <right_attach>1</right_attach>
-       <top_attach>1</top_attach>
-       <bottom_attach>2</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>False</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>False</yfill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox4</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-       <left_attach>1</left_attach>
-       <right_attach>2</right_attach>
-       <top_attach>0</top_attach>
-       <bottom_attach>1</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>False</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>True</yfill>
-      </child>
-
-      <widget>
-       <class>GtkOptionMenu</class>
-       <name>transport</name>
-       <can_focus>True</can_focus>
-       <items></items>
-       <initial_choice>0</initial_choice>
-       <child>
-         <padding>0</padding>
-         <expand>False</expand>
-         <fill>False</fill>
-       </child>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkNotebook</class>
-      <name>transport_notebook</name>
-      <show_tabs>False</show_tabs>
-      <show_border>False</show_border>
-      <tab_pos>GTK_POS_TOP</tab_pos>
-      <scrollable>False</scrollable>
-      <tab_hborder>2</tab_hborder>
-      <tab_vborder>2</tab_vborder>
-      <popup_enable>False</popup_enable>
-      <child>
-       <left_attach>1</left_attach>
-       <right_attach>2</right_attach>
-       <top_attach>1</top_attach>
-       <bottom_attach>2</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>False</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>True</yfill>
-      </child>
-
-      <widget>
-       <class>GtkHBox</class>
-       <name>hbox1</name>
-       <homogeneous>False</homogeneous>
-       <spacing>0</spacing>
-
-       <widget>
-         <class>GtkEntry</class>
-         <name>hostname</name>
-         <tooltip>Hostname or IP address of spamd server</tooltip>
-         <can_focus>True</can_focus>
-         <editable>True</editable>
-         <text_visible>True</text_visible>
-         <text_max_length>0</text_max_length>
-         <text></text>
-         <child>
-           <padding>0</padding>
-           <expand>True</expand>
-           <fill>True</fill>
-         </child>
-       </widget>
-
-       <widget>
-         <class>GtkLabel</class>
-         <name>colon</name>
-         <label>:</label>
-         <justify>GTK_JUSTIFY_CENTER</justify>
-         <wrap>False</wrap>
-         <xalign>0.5</xalign>
-         <yalign>0.5</yalign>
-         <xpad>8</xpad>
-         <ypad>0</ypad>
-         <child>
-           <padding>0</padding>
-           <expand>False</expand>
-           <fill>False</fill>
-         </child>
-       </widget>
-
-       <widget>
-         <class>GtkSpinButton</class>
-         <name>port</name>
-         <width>64</width>
-         <tooltip>Port of spamd server</tooltip>
-         <can_focus>True</can_focus>
-         <climb_rate>1</climb_rate>
-         <digits>0</digits>
-         <numeric>True</numeric>
-         <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-         <snap>False</snap>
-         <wrap>False</wrap>
-         <value>783</value>
-         <lower>1</lower>
-         <upper>65535</upper>
-         <step>1</step>
-         <page>10</page>
-         <page_size>10</page_size>
-         <child>
-           <padding>0</padding>
-           <expand>False</expand>
-           <fill>True</fill>
-           <pack>GTK_PACK_END</pack>
-         </child>
-       </widget>
-      </widget>
-
-      <widget>
-       <class>Placeholder</class>
-       <child_name>Notebook:tab</child_name>
-      </widget>
-
-      <widget>
-       <class>GtkEntry</class>
-       <name>socket</name>
-       <tooltip>Path of Unix socket</tooltip>
-       <can_focus>True</can_focus>
-       <editable>True</editable>
-       <text_visible>True</text_visible>
-       <text_max_length>0</text_max_length>
-       <text></text>
-      </widget>
-
-      <widget>
-       <class>Placeholder</class>
-       <child_name>Notebook:tab</child_name>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <name>label15</name>
-      <label>Timeout</label>
-      <justify>GTK_JUSTIFY_CENTER</justify>
-      <wrap>False</wrap>
-      <xalign>0</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-      <child>
-       <left_attach>0</left_attach>
-       <right_attach>1</right_attach>
-       <top_attach>5</top_attach>
-       <bottom_attach>6</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>False</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>False</yfill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox6</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-       <left_attach>1</left_attach>
-       <right_attach>2</right_attach>
-       <top_attach>5</top_attach>
-       <bottom_attach>6</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>False</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>True</yfill>
-      </child>
-
-      <widget>
-       <class>GtkSpinButton</class>
-       <name>timeout</name>
-       <width>64</width>
-       <tooltip>Time that is allowed for checking. If the check takes longer the check will be aborted and the message will be handled as not spam.</tooltip>
-       <can_focus>True</can_focus>
-       <climb_rate>1</climb_rate>
-       <digits>0</digits>
-       <numeric>True</numeric>
-       <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-       <snap>False</snap>
-       <wrap>False</wrap>
-       <value>60</value>
-       <lower>0</lower>
-       <upper>10000</upper>
-       <step>10</step>
-       <page>10</page>
-       <page_size>10</page_size>
-       <child>
-         <padding>0</padding>
-         <expand>False</expand>
-         <fill>True</fill>
-         <pack>GTK_PACK_END</pack>
-       </child>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <name>label16</name>
-      <label>s</label>
-      <justify>GTK_JUSTIFY_CENTER</justify>
-      <wrap>False</wrap>
-      <xalign>0</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-      <child>
-       <left_attach>2</left_attach>
-       <right_attach>3</right_attach>
-       <top_attach>5</top_attach>
-       <bottom_attach>6</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>False</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>False</yfill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <name>label9</name>
-      <label>Save Spam</label>
-      <justify>GTK_JUSTIFY_CENTER</justify>
-      <wrap>False</wrap>
-      <xalign>0</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-      <child>
-       <left_attach>0</left_attach>
-       <right_attach>1</right_attach>
-       <top_attach>2</top_attach>
-       <bottom_attach>3</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>False</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>False</yfill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkCheckButton</class>
-      <name>receive_spam</name>
-      <tooltip>Save mails that where identified as spam to a folder</tooltip>
-      <can_focus>True</can_focus>
-      <label></label>
-      <active>False</active>
-      <draw_indicator>True</draw_indicator>
-      <child>
-       <left_attach>1</left_attach>
-       <right_attach>2</right_attach>
-       <top_attach>2</top_attach>
-       <bottom_attach>3</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>True</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>False</yfill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox3</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-       <left_attach>1</left_attach>
-       <right_attach>2</right_attach>
-       <top_attach>4</top_attach>
-       <bottom_attach>5</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>True</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>True</yfill>
-      </child>
-
-      <widget>
-       <class>GtkSpinButton</class>
-       <name>max_size</name>
-       <width>64</width>
-       <tooltip>Maximum size a message is allowed to have to be checked</tooltip>
-       <can_focus>True</can_focus>
-       <climb_rate>1</climb_rate>
-       <digits>0</digits>
-       <numeric>True</numeric>
-       <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-       <snap>False</snap>
-       <wrap>False</wrap>
-       <value>250</value>
-       <lower>0</lower>
-       <upper>10000</upper>
-       <step>10</step>
-       <page>10</page>
-       <page_size>10</page_size>
-       <child>
-         <padding>0</padding>
-         <expand>False</expand>
-         <fill>True</fill>
-         <pack>GTK_PACK_END</pack>
-       </child>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <name>label11</name>
-      <label>kB</label>
-      <justify>GTK_JUSTIFY_CENTER</justify>
-      <wrap>False</wrap>
-      <xalign>0</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-      <child>
-       <left_attach>2</left_attach>
-       <right_attach>3</right_attach>
-       <top_attach>4</top_attach>
-       <bottom_attach>5</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>False</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>False</yfill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <name>label8</name>
-      <label>Save Folder</label>
-      <justify>GTK_JUSTIFY_LEFT</justify>
-      <wrap>False</wrap>
-      <xalign>0</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-      <child>
-       <left_attach>0</left_attach>
-       <right_attach>1</right_attach>
-       <top_attach>3</top_attach>
-       <bottom_attach>4</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>False</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>False</yfill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkEntry</class>
-      <name>save_folder</name>
-      <tooltip>Folder that will be used to save spam. Leave empty to use the default trash folder</tooltip>
-      <can_focus>True</can_focus>
-      <editable>True</editable>
-      <text_visible>True</text_visible>
-      <text_max_length>0</text_max_length>
-      <text></text>
-      <child>
-       <left_attach>1</left_attach>
-       <right_attach>2</right_attach>
-       <top_attach>3</top_attach>
-       <bottom_attach>4</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>True</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>False</yfill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkButton</class>
-      <name>button4</name>
-      <can_focus>True</can_focus>
-      <label>...</label>
-      <relief>GTK_RELIEF_NORMAL</relief>
-      <child>
-       <left_attach>2</left_attach>
-       <right_attach>3</right_attach>
-       <top_attach>3</top_attach>
-       <bottom_attach>4</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>False</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>True</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>False</yfill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <name>label6</name>
-      <label>Maximum Size</label>
-      <justify>GTK_JUSTIFY_CENTER</justify>
-      <wrap>False</wrap>
-      <xalign>0</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-      <child>
-       <left_attach>0</left_attach>
-       <right_attach>1</right_attach>
-       <top_attach>4</top_attach>
-       <bottom_attach>5</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>False</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>False</yfill>
-      </child>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>

diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index c9cae2bfc77698fe7ac346e51f1adad324be2119..6c0e1e465aed6c721a27f08644a5bef7c8fe73b9 100644 (file)
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -271,7 +271,7 @@ static void prefs_actions_create(MainWindow *mainwin)
        g_signal_connect(G_OBJECT(del_btn), "clicked",
                         G_CALLBACK(prefs_actions_delete_cb), NULL);
 
        g_signal_connect(G_OBJECT(del_btn), "clicked",
                         G_CALLBACK(prefs_actions_delete_cb), NULL);
 

-       help_button = gtk_button_new_with_label(_(" Syntax help "));
+       help_button = gtk_button_new_with_label(_(" Syntax help... "));

        gtk_widget_show(help_button);
        gtk_box_pack_end(GTK_BOX(reg_hbox), help_button, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(help_button), "clicked",
        gtk_widget_show(help_button);
        gtk_box_pack_end(GTK_BOX(reg_hbox), help_button, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(help_button), "clicked",

diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
index 788281dd4e13e743c95ce5124b4627276a9c840f..a771ee0667ed59634b6a31189f2c6049856c0894 100644 (file)
--- a/src/prefs_filtering.c
+++ b/src/prefs_filtering.c
@@ -289,7 +289,7 @@ static void prefs_filtering_create(void)
                          (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
                          (GtkAttachOptions) (0), 0, 0);
 
                          (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
                          (GtkAttachOptions) (0), 0, 0);
 

-       cond_btn = gtk_button_new_with_label (_("Define..."));
+       cond_btn = gtk_button_new_with_label (_(" Define... "));

        gtk_widget_show (cond_btn);
        gtk_table_attach (GTK_TABLE (table), cond_btn, 2, 3, 1, 2,
                          (GtkAttachOptions) (GTK_FILL),
        gtk_widget_show (cond_btn);
        gtk_table_attach (GTK_TABLE (table), cond_btn, 2, 3, 1, 2,
                          (GtkAttachOptions) (GTK_FILL),


@@ -311,7 +311,7 @@ static void prefs_filtering_create(void)
                          (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
                          (GtkAttachOptions) (0), 0, 0);
 
                          (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
                          (GtkAttachOptions) (0), 0, 0);
 

-       action_btn = gtk_button_new_with_label (_("Define..."));
+       action_btn = gtk_button_new_with_label (_(" Define... "));

        gtk_widget_show (action_btn);
        gtk_table_attach (GTK_TABLE (table), action_btn, 2, 3, 2, 3,
                          (GtkAttachOptions) (GTK_FILL),
        gtk_widget_show (action_btn);
        gtk_table_attach (GTK_TABLE (table), action_btn, 2, 3, 2, 3,
                          (GtkAttachOptions) (GTK_FILL),

diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 3f3c95e44517f046c4cde2b704b7122c3cd2225e..0f4c2691b08bbd8ccd75874cbe9ae6f052e19aae 100644 (file)
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -499,7 +499,7 @@ static void prefs_matcher_create(void)
        gtk_table_attach(GTK_TABLE(criteria_table), value_entry, 2, 3, 1, 2,
                         GTK_FILL | GTK_SHRINK | GTK_EXPAND, 0, 0, 0);
 
        gtk_table_attach(GTK_TABLE(criteria_table), value_entry, 2, 3, 1, 2,
                         GTK_FILL | GTK_SHRINK | GTK_EXPAND, 0, 0, 0);
 

-       test_btn = gtk_button_new_with_label(_("Info ..."));
+       test_btn = gtk_button_new_with_label(_(" Info... "));

        gtk_widget_show(test_btn);
        gtk_table_attach(GTK_TABLE (criteria_table), test_btn, 3, 4, 1, 2,
                         0, 0, 0, 0);
        gtk_widget_show(test_btn);
        gtk_table_attach(GTK_TABLE (criteria_table), test_btn, 3, 4, 1, 2,
                         0, 0, 0, 0);

diff --git a/src/prefs_spelling.glade b/src/prefs_spelling.glade
deleted file mode 100644 (file)
index 4c2fc1d..0000000
--- a/src/prefs_spelling.glade
+++ /dev/null
@@ -1,341 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Sylpheed-Claws</name>
-  <program_name>sylpheed-claws</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>False</gnome_support>
-  <gettext_support>True</gettext_support>
-  <output_main_file>False</output_main_file>
-  <output_build_files>False</output_build_files>
-  <backup_source_files>False</backup_source_files>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>prefs_spelling</name>
-  <title>Prefs Spelling</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkTable</class>
-    <name>table</name>
-    <border_width>8</border_width>
-    <rows>7</rows>
-    <columns>3</columns>
-    <homogeneous>False</homogeneous>
-    <row_spacing>4</row_spacing>
-    <column_spacing>8</column_spacing>
-
-    <widget>
-      <class>GtkCheckButton</class>
-      <name>checkbtn_enable_aspell</name>
-      <can_focus>True</can_focus>
-      <label>Enable spell checker</label>
-      <active>False</active>
-      <draw_indicator>True</draw_indicator>
-      <child>
-       <left_attach>0</left_attach>
-       <right_attach>3</right_attach>
-       <top_attach>0</top_attach>
-       <bottom_attach>1</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>False</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>False</yfill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkCheckButton</class>
-      <name>checkbtn_check_while_typing</name>
-      <can_focus>True</can_focus>
-      <label>Check while typing</label>
-      <active>False</active>
-      <draw_indicator>True</draw_indicator>
-      <child>
-       <left_attach>0</left_attach>
-       <right_attach>3</right_attach>
-       <top_attach>1</top_attach>
-       <bottom_attach>2</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>False</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>False</yfill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkCheckButton</class>
-      <name>checkbtn_use_alternate</name>
-      <tooltip>Faster switching with last used dictionary</tooltip>
-      <can_focus>True</can_focus>
-      <label>Enable alternate dictionary</label>
-      <active>False</active>
-      <draw_indicator>True</draw_indicator>
-      <child>
-       <left_attach>0</left_attach>
-       <right_attach>3</right_attach>
-       <top_attach>2</top_attach>
-       <bottom_attach>3</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>False</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>False</yfill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <name>label2</name>
-      <label>Dictionaries path:</label>
-      <justify>GTK_JUSTIFY_RIGHT</justify>
-      <wrap>False</wrap>
-      <xalign>1</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-      <child>
-       <left_attach>0</left_attach>
-       <right_attach>1</right_attach>
-       <top_attach>3</top_attach>
-       <bottom_attach>4</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>False</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>False</yfill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkEntry</class>
-      <name>entry_aspell_path</name>
-      <can_focus>True</can_focus>
-      <editable>True</editable>
-      <text_visible>True</text_visible>
-      <text_max_length>0</text_max_length>
-      <text></text>
-      <child>
-       <left_attach>1</left_attach>
-       <right_attach>2</right_attach>
-       <top_attach>3</top_attach>
-       <bottom_attach>4</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>True</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>False</yfill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <name>label3</name>
-      <label>Default dictionary:</label>
-      <justify>GTK_JUSTIFY_RIGHT</justify>
-      <wrap>False</wrap>
-      <xalign>1</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-      <child>
-       <left_attach>0</left_attach>
-       <right_attach>1</right_attach>
-       <top_attach>4</top_attach>
-       <bottom_attach>5</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>False</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>False</yfill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkOptionMenu</class>
-      <name>optmenu_dictionary</name>
-      <can_focus>True</can_focus>
-      <items></items>
-      <initial_choice>0</initial_choice>
-      <child>
-       <left_attach>1</left_attach>
-       <right_attach>3</right_attach>
-       <top_attach>4</top_attach>
-       <bottom_attach>5</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>False</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>False</yfill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <name>label4</name>
-      <label>Default suggestion mode:</label>
-      <justify>GTK_JUSTIFY_RIGHT</justify>
-      <wrap>False</wrap>
-      <xalign>1</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-      <child>
-       <left_attach>0</left_attach>
-       <right_attach>1</right_attach>
-       <top_attach>5</top_attach>
-       <bottom_attach>6</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>False</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>False</yfill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkOptionMenu</class>
-      <name>optmenu_sugmode</name>
-      <can_focus>True</can_focus>
-      <items></items>
-      <initial_choice>0</initial_choice>
-      <child>
-       <left_attach>1</left_attach>
-       <right_attach>3</right_attach>
-       <top_attach>5</top_attach>
-       <bottom_attach>6</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>False</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>False</yfill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <name>label5</name>
-      <label>Misspelled word color:</label>
-      <justify>GTK_JUSTIFY_RIGHT</justify>
-      <wrap>False</wrap>
-      <xalign>1</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-      <child>
-       <left_attach>0</left_attach>
-       <right_attach>1</right_attach>
-       <top_attach>6</top_attach>
-       <bottom_attach>7</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>False</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>False</yfill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkButton</class>
-      <name>btn_aspell_path</name>
-      <can_focus>True</can_focus>
-      <label> ... </label>
-      <relief>GTK_RELIEF_NORMAL</relief>
-      <child>
-       <left_attach>2</left_attach>
-       <right_attach>3</right_attach>
-       <top_attach>3</top_attach>
-       <bottom_attach>4</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>False</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>False</yfill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox1</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-       <left_attach>1</left_attach>
-       <right_attach>2</right_attach>
-       <top_attach>6</top_attach>
-       <bottom_attach>7</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>False</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>True</yfill>
-      </child>
-
-      <widget>
-       <class>GtkButton</class>
-       <name>misspelled_btn</name>
-       <width>30</width>
-       <height>20</height>
-       <can_focus>True</can_focus>
-       <label></label>
-       <relief>GTK_RELIEF_NORMAL</relief>
-       <child>
-         <padding>0</padding>
-         <expand>False</expand>
-         <fill>False</fill>
-       </child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>

diff --git a/src/prefs_template.c b/src/prefs_template.c
index 22099ff4660ef06f9389c7a5b2a28cb4851d8d2c..a319488e2971a9d02da17fb293f75e923dd23c0f 100644 (file)
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -266,7 +266,7 @@ static void prefs_template_window_create(void)
        g_signal_connect(G_OBJECT(del_btn), "clicked",
                         G_CALLBACK(prefs_template_delete_cb), NULL);
 
        g_signal_connect(G_OBJECT(del_btn), "clicked",
                         G_CALLBACK(prefs_template_delete_cb), NULL);
 

-       desc_btn = gtk_button_new_with_label(_(" Symbols "));
+       desc_btn = gtk_button_new_with_label(_(" Symbols... "));

        gtk_widget_show(desc_btn);
        gtk_box_pack_end(GTK_BOX(hbox2), desc_btn, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(desc_btn), "clicked",
        gtk_widget_show(desc_btn);
        gtk_box_pack_end(GTK_BOX(hbox2), desc_btn, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(desc_btn), "clicked",