=== modified file 'glade/favoritehubs.glade'
--- glade/favoritehubs.glade	2008-11-30 02:21:44 +0000
+++ glade/favoritehubs.glade	2008-12-14 18:49:28 +0000
@@ -88,266 +88,302 @@
   </widget>
   <widget class="GtkDialog" id="favoriteHubsDialog">
     <property name="title" translatable="yes">Favorite Hubs Properties</property>
-    <property name="resizable">False</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
         <child>
-          <widget class="GtkVBox" id="vbox1">
+          <widget class="GtkAlignment" id="alignment1">
             <property name="visible">True</property>
-            <property name="border_width">8</property>
-            <property name="spacing">8</property>
+            <property name="top_padding">12</property>
+            <property name="bottom_padding">12</property>
+            <property name="left_padding">12</property>
+            <property name="right_padding">12</property>
             <child>
-              <widget class="GtkFrame" id="frame1">
+              <widget class="GtkTable" id="table3">
                 <property name="visible">True</property>
-                <property name="label_xalign">0</property>
-                <child>
-                  <widget class="GtkTable" id="table1">
-                    <property name="visible">True</property>
-                    <property name="border_width">8</property>
-                    <property name="n_rows">4</property>
-                    <property name="n_columns">2</property>
-                    <property name="column_spacing">2</property>
-                    <child>
-                      <widget class="GtkComboBoxEntry" id="comboboxCharset">
-                        <property name="visible">True</property>
-                        <property name="items" translatable="no"></property>
-                        <child internal-child="entry">
-                          <widget class="GtkEntry" id="comboboxentryCharset">
-                            <property name="visible">True</property>
-                            <property name="activates_default">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK</property>
-                          </widget>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">3</property>
-                        <property name="bottom_attach">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkEntry" id="entryDescription">
-                        <property name="width_request">200</property>
-                        <property name="visible">True</property>
-                        <property name="activates_default">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">*</property>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkEntry" id="entryAddress">
-                        <property name="width_request">200</property>
-                        <property name="visible">True</property>
-                        <property name="activates_default">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">*</property>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkEntry" id="entryName">
-                        <property name="width_request">200</property>
-                        <property name="visible">True</property>
-                        <property name="activates_default">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">*</property>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label4">
-                        <property name="visible">True</property>
-                        <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Description</property>
-                      </widget>
-                      <packing>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label3">
-                        <property name="visible">True</property>
-                        <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Address</property>
-                      </widget>
-                      <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label2">
-                        <property name="visible">True</property>
-                        <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Name</property>
-                      </widget>
-                      <packing>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="labelEncoding">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Encoding</property>
-                      </widget>
-                      <packing>
-                        <property name="top_attach">3</property>
-                        <property name="bottom_attach">4</property>
-                      </packing>
-                    </child>
-                  </widget>
+                <property name="n_rows">10</property>
+                <property name="n_columns">3</property>
+                <property name="column_spacing">12</property>
+                <property name="row_spacing">6</property>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <widget class="GtkEntry" id="entryUDescription">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">*</property>
+                    <property name="activates_default">True</property>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">9</property>
+                    <property name="bottom_attach">10</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label16">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Description:</property>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">9</property>
+                    <property name="bottom_attach">10</property>
+                    <property name="x_options">GTK_FILL</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkEntry" id="entryPassword">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="visibility">False</property>
+                    <property name="invisible_char">*</property>
+                    <property name="activates_default">True</property>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">8</property>
+                    <property name="bottom_attach">9</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkEntry" id="entryNick">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">*</property>
+                    <property name="activates_default">True</property>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">7</property>
+                    <property name="bottom_attach">8</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label15">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Password:</property>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">8</property>
+                    <property name="bottom_attach">9</property>
+                    <property name="x_options">GTK_FILL</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label14">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Nick:</property>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">7</property>
+                    <property name="bottom_attach">8</property>
+                    <property name="x_options">GTK_FILL</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label17">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Identification (leave blank for defaults)&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </widget>
+                  <packing>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">6</property>
+                    <property name="bottom_attach">7</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkComboBoxEntry" id="comboboxCharset">
+                    <property name="visible">True</property>
+                    <property name="items"></property>
+                    <child internal-child="entry">
+                      <widget class="GtkEntry" id="comboboxentryCharset">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK</property>
+                        <property name="activates_default">True</property>
+                      </widget>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">5</property>
+                    <property name="bottom_attach">6</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="labelCharset">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Encoding:</property>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">5</property>
+                    <property name="bottom_attach">6</property>
+                    <property name="x_options">GTK_FILL</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkCheckButton" id="checkbuttonOverride">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label" translatable="yes">Override default encoding</property>
+                    <property name="response_id">0</property>
+                    <property name="draw_indicator">True</property>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">4</property>
+                    <property name="bottom_attach">5</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkEntry" id="entryDescription">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">*</property>
+                    <property name="activates_default">True</property>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">3</property>
+                    <property name="bottom_attach">4</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label12">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Description:</property>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">3</property>
+                    <property name="bottom_attach">4</property>
+                    <property name="x_options">GTK_FILL</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkEntry" id="entryAddress">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">*</property>
+                    <property name="activates_default">True</property>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label11">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Address:</property>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
+                    <property name="x_options">GTK_FILL</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkEntry" id="entryName">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">*</property>
+                    <property name="activates_default">True</property>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label10">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Name:</property>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                    <property name="x_options">GTK_FILL</property>
+                  </packing>
                 </child>
                 <child>
                   <widget class="GtkLabel" id="label1">
                     <property name="visible">True</property>
+                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">&lt;b&gt;Hub&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
                   </widget>
                   <packing>
-                    <property name="type">label_item</property>
-                  </packing>
-                </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkFrame" id="frame2">
-                <property name="visible">True</property>
-                <property name="label_xalign">0</property>
-                <child>
-                  <widget class="GtkTable" id="table2">
-                    <property name="visible">True</property>
-                    <property name="border_width">8</property>
-                    <property name="n_rows">3</property>
-                    <property name="n_columns">2</property>
-                    <property name="column_spacing">2</property>
-                    <child>
-                      <widget class="GtkEntry" id="entryUDescription">
-                        <property name="visible">True</property>
-                        <property name="activates_default">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">*</property>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkEntry" id="entryPassword">
-                        <property name="visible">True</property>
-                        <property name="activates_default">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="visibility">False</property>
-                        <property name="invisible_char">*</property>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkEntry" id="entryNick">
-                        <property name="visible">True</property>
-                        <property name="activates_default">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">*</property>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label8">
-                        <property name="visible">True</property>
-                        <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Description</property>
-                      </widget>
-                      <packing>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label7">
-                        <property name="visible">True</property>
-                        <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Password</property>
-                      </widget>
-                      <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label6">
-                        <property name="visible">True</property>
-                        <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Nick</property>
-                      </widget>
-                      <packing>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                  </widget>
-                </child>
-                <child>
-                  <widget class="GtkLabel" id="label5">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Identification (leave blank for defaults)&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
+                    <property name="right_attach">3</property>
+                  </packing>
+                </child>
+              </widget>
             </child>
           </widget>
           <packing>
+            <property name="expand">False</property>
             <property name="position">2</property>
           </packing>
         </child>

=== modified file 'linux/WulforUtil.cc'
--- linux/WulforUtil.cc	2008-12-13 01:26:16 +0000
+++ linux/WulforUtil.cc	2008-12-14 18:55:37 +0000
@@ -31,8 +31,8 @@
 
 using namespace std;
 
-const string WulforUtil::ENCODING_SYSTEM_DEFAULT = _("System default");
-const string WulforUtil::ENCODING_GLOBAL_HUB_DEFAULT = _("Global hub default");
+const string WulforUtil::ENCODING_LOCALE = N_("System default");
+const string WulforUtil::ENCODING_DEFAULT = N_("Default");
 std::vector<std::string> WulforUtil::charsets;
 const std::string WulforUtil::magnetSignature = "magnet:?xt=urn:tree:tiger:";
 
@@ -160,23 +160,23 @@
 {
 	if (charsets.size() == 0)
 	{
-		charsets.push_back(_("System default"));
-		charsets.push_back(_("UTF-8 (Unicode)"));
-		charsets.push_back(_("CP1252 (Western Europe)"));
-		charsets.push_back(_("CP1250 (Central Europe)"));
-		charsets.push_back(_("ISO-8859-2 (Central Europe)"));
-		charsets.push_back(_("ISO-8859-7 (Greek)"));
-		charsets.push_back(_("ISO-8859-8 (Hebrew)"));
-		charsets.push_back(_("ISO-8859-9 (Turkish)"));
-		charsets.push_back(_("ISO-2022-JP (Japanese)"));
-		charsets.push_back(_("SJIS (Japanese)"));
-		charsets.push_back(_("CP949 (Korean)"));
-		charsets.push_back(_("KOI8-R (Cyrillic)"));
-		charsets.push_back(_("CP1251 (Cyrillic)"));
-		charsets.push_back(_("CP1256 (Arabic)"));
-		charsets.push_back(_("CP1257 (Baltic)"));
-		charsets.push_back(_("GB18030 (Chinese)"));
-		charsets.push_back(_("TIS-620 (Thai)"));
+		charsets.push_back(ENCODING_LOCALE);
+		charsets.push_back(N_("CP949 (Korean)"));
+		charsets.push_back(N_("CP1250 (Central Europe)"));
+		charsets.push_back(N_("CP1251 (Cyrillic)"));
+		charsets.push_back(N_("CP1252 (Western Europe)"));
+		charsets.push_back(N_("CP1256 (Arabic)"));
+		charsets.push_back(N_("CP1257 (Baltic)"));
+		charsets.push_back(N_("GB18030 (Chinese)"));
+		charsets.push_back(N_("ISO-2022-JP (Japanese)"));
+		charsets.push_back(N_("ISO-8859-2 (Central Europe)"));
+		charsets.push_back(N_("ISO-8859-7 (Greek)"));
+		charsets.push_back(N_("ISO-8859-8 (Hebrew)"));
+		charsets.push_back(N_("ISO-8859-9 (Turkish)"));
+		charsets.push_back(N_("KOI8-R (Cyrillic)"));
+		charsets.push_back(N_("SJIS (Japanese)"));
+		charsets.push_back(N_("TIS-620 (Thai)"));
+		charsets.push_back(N_("UTF-8 (Unicode)"));
 	}
 	return charsets;
 }

=== modified file 'linux/WulforUtil.hh'
--- linux/WulforUtil.hh	2008-12-04 05:49:15 +0000
+++ linux/WulforUtil.hh	2008-12-14 18:47:18 +0000
@@ -55,8 +55,8 @@
 		// Profile locking
 		static bool profileIsLocked();
 
-		static const std::string ENCODING_SYSTEM_DEFAULT;
-		static const std::string ENCODING_GLOBAL_HUB_DEFAULT;
+		static const std::string ENCODING_LOCALE;
+		static const std::string ENCODING_DEFAULT;
 		
 	private:
 		static std::vector<std::string> charsets;

=== modified file 'linux/favoritehubs.cc'
--- linux/favoritehubs.cc	2008-12-04 05:49:15 +0000
+++ linux/favoritehubs.cc	2008-12-14 18:47:18 +0000
@@ -34,7 +34,6 @@
 	gtk_dialog_set_alternative_button_order(GTK_DIALOG(getWidget("favoriteHubsDialog")), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1);
 
 	// Fill the charset drop-down list in edit fav hub dialog.
-	gtk_combo_box_append_text(GTK_COMBO_BOX(getWidget("comboboxCharset")), WulforUtil::ENCODING_GLOBAL_HUB_DEFAULT.c_str());
 	vector<string> &charsets = WulforUtil::getCharsets();
 	for (vector<string>::const_iterator it = charsets.begin(); it != charsets.end(); ++it)
 		gtk_combo_box_append_text(GTK_COMBO_BOX(getWidget("comboboxCharset")), it->c_str());
@@ -78,6 +77,7 @@
 	g_signal_connect(favoriteView.get(), "button-press-event", G_CALLBACK(onButtonPressed_gui), (gpointer)this);
 	g_signal_connect(favoriteView.get(), "button-release-event", G_CALLBACK(onButtonReleased_gui), (gpointer)this);
 	g_signal_connect(favoriteView.get(), "key-release-event", G_CALLBACK(onKeyReleased_gui), (gpointer)this);
+	g_signal_connect(getWidget("checkbuttonOverride"), "toggled", G_CALLBACK(onOverrideToggled_gui), (gpointer)this);
 }
 
 FavoriteHubs::~FavoriteHubs()
@@ -103,7 +103,7 @@
 
 void FavoriteHubs::editEntry_gui(StringMap &params, GtkTreeIter *iter)
 {
-	string encoding = params["Encoding"].empty() ? WulforUtil::ENCODING_GLOBAL_HUB_DEFAULT : params["Encoding"];
+	string encoding = params["Encoding"].empty() ? WulforUtil::ENCODING_DEFAULT : params["Encoding"];
 
 	gtk_list_store_set(favoriteStore, iter,
 		favoriteView.col("Auto Connect"), Util::toInt(params["Auto Connect"]),
@@ -135,6 +135,27 @@
 	}
 }
 
+void FavoriteHubs::saveParams(StringMap &params)
+{
+	params["Name"] = gtk_entry_get_text(GTK_ENTRY(this->getWidget("entryName")));
+	params["Address"] = gtk_entry_get_text(GTK_ENTRY(this->getWidget("entryAddress")));
+	params["Description"] = gtk_entry_get_text(GTK_ENTRY(this->getWidget("entryDescription")));
+	params["Nick"] = gtk_entry_get_text(GTK_ENTRY(this->getWidget("entryNick")));
+	params["Hidden Password"] = gtk_entry_get_text(GTK_ENTRY(this->getWidget("entryPassword")));
+	params["User Description"] = gtk_entry_get_text(GTK_ENTRY(this->getWidget("entryUDescription")));
+
+	if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(this->getWidget("checkbuttonOverride"))))
+	{
+		params["Encoding"] = WulforUtil::ENCODING_DEFAULT;
+	}
+	else
+	{
+		gchar *encoding = gtk_combo_box_get_active_text(GTK_COMBO_BOX(this->getWidget("comboboxCharset")));
+		params["Encoding"] = string(encoding);
+		g_free(encoding);
+	}
+}
+
 void FavoriteHubs::showErrorDialog_gui(const string &description)
 {
 	gtk_label_set_text(GTK_LABEL(getWidget("errorLabel")), description.c_str());
@@ -243,7 +264,7 @@
 	gtk_entry_set_text(GTK_ENTRY(fh->getWidget("entryNick")), "");
 	gtk_entry_set_text(GTK_ENTRY(fh->getWidget("entryPassword")), "");
 	gtk_entry_set_text(GTK_ENTRY(fh->getWidget("entryUDescription")), "");
-	gtk_entry_set_text(GTK_ENTRY(fh->getWidget("comboboxentryCharset")), WulforUtil::ENCODING_GLOBAL_HUB_DEFAULT.c_str());
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(fh->getWidget("checkbuttonOverride")), FALSE);
 
 	int response = gtk_dialog_run(GTK_DIALOG(fh->getWidget("favoriteHubsDialog")));
 	gtk_widget_hide(fh->getWidget("favoriteHubsDialog"));
@@ -251,16 +272,8 @@
 	if (response == GTK_RESPONSE_OK)
 	{
 		StringMap params;
-		params["Name"] = gtk_entry_get_text(GTK_ENTRY(fh->getWidget("entryName")));
-		params["Address"] = gtk_entry_get_text(GTK_ENTRY(fh->getWidget("entryAddress")));
-		params["Description"] = gtk_entry_get_text(GTK_ENTRY(fh->getWidget("entryDescription")));
-		params["Nick"] = gtk_entry_get_text(GTK_ENTRY(fh->getWidget("entryNick")));
-		params["Hidden Password"] = gtk_entry_get_text(GTK_ENTRY(fh->getWidget("entryPassword")));
-		params["User Description"] = gtk_entry_get_text(GTK_ENTRY(fh->getWidget("entryUDescription")));
 
-		gchar *encoding = gtk_combo_box_get_active_text(GTK_COMBO_BOX(fh->getWidget("comboboxCharset")));
-		params["Encoding"] = string(encoding);
-		g_free(encoding);
+		fh->saveParams(params);
 
 		if (params["Name"].empty() || params["Address"].empty())
 		{
@@ -298,7 +311,10 @@
 	gtk_entry_set_text(GTK_ENTRY(fh->getWidget("entryNick")), params["Nick"].c_str());
 	gtk_entry_set_text(GTK_ENTRY(fh->getWidget("entryPassword")), params["Hidden Password"].c_str());
 	gtk_entry_set_text(GTK_ENTRY(fh->getWidget("entryUDescription")), params["User Description"].c_str());
-	gtk_entry_set_text(GTK_ENTRY(fh->getWidget("comboboxentryCharset")), params["Encoding"].c_str());
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(fh->getWidget("checkbuttonOverride")), params["Encoding"] != WulforUtil::ENCODING_DEFAULT);
+	onOverrideToggled_gui(GTK_TOGGLE_BUTTON(fh->getWidget("checkbuttonOverride")), fh);
+	if (params["Encoding"] != WulforUtil::ENCODING_DEFAULT)
+		gtk_entry_set_text(GTK_ENTRY(fh->getWidget("comboboxentryCharset")), params["Encoding"].c_str());	  
 
 	int response = gtk_dialog_run(GTK_DIALOG(fh->getWidget("favoriteHubsDialog")));
 	gtk_widget_hide(fh->getWidget("favoriteHubsDialog"));
@@ -306,16 +322,7 @@
 	if (response == GTK_RESPONSE_OK)
 	{
 		params.clear();
-		params["Name"] = gtk_entry_get_text(GTK_ENTRY(fh->getWidget("entryName")));
-		params["Address"] = gtk_entry_get_text(GTK_ENTRY(fh->getWidget("entryAddress")));
-		params["Description"] = gtk_entry_get_text(GTK_ENTRY(fh->getWidget("entryDescription")));
-		params["Nick"] = gtk_entry_get_text(GTK_ENTRY(fh->getWidget("entryNick")));
-		params["Hidden Password"] = gtk_entry_get_text(GTK_ENTRY(fh->getWidget("entryPassword")));
-		params["User Description"] = gtk_entry_get_text(GTK_ENTRY(fh->getWidget("entryUDescription")));
-
-		gchar *encoding = gtk_combo_box_get_active_text(GTK_COMBO_BOX(fh->getWidget("comboboxCharset")));
-		params["Encoding"] = string(encoding);
-		g_free(encoding);
+		fh->saveParams(params);
 
 		if (params["Name"].empty() || params["Address"].empty())
 		{
@@ -360,6 +367,17 @@
 	}
 }
 
+void FavoriteHubs::onOverrideToggled_gui(GtkToggleButton *button, gpointer data)
+{
+	FavoriteHubs *fh = (FavoriteHubs *)data;
+	bool override = gtk_toggle_button_get_active(button);
+	
+	gtk_widget_set_sensitive(fh->getWidget("comboboxCharset"), override);
+	gtk_widget_set_sensitive(fh->getWidget("labelCharset"), override);
+
+	gtk_entry_set_text(GTK_ENTRY(fh->getWidget("comboboxentryCharset")), WGETS("default-charset").c_str());
+}
+
 void FavoriteHubs::onConnect_gui(GtkButton *widget, gpointer data)
 {
 	FavoriteHubs *fh = (FavoriteHubs *)data;

=== modified file 'linux/favoritehubs.hh'
--- linux/favoritehubs.hh	2008-07-03 03:53:56 +0000
+++ linux/favoritehubs.hh	2008-12-14 18:47:18 +0000
@@ -43,6 +43,7 @@
 		void addEntry_gui(StringMap params);
 		void editEntry_gui(StringMap &params, GtkTreeIter *iter);
 		void removeEntry_gui(std::string address);
+		void saveParams(StringMap &params);
 		void showErrorDialog_gui(const std::string &description);
 		void popupMenu_gui();
 
@@ -53,6 +54,7 @@
 		static void onAddEntry_gui(GtkWidget *widget, gpointer data);
 		static void onEditEntry_gui(GtkWidget *widget, gpointer data);
 		static void onRemoveEntry_gui(GtkWidget *widget, gpointer data);
+		static void onOverrideToggled_gui(GtkToggleButton *button, gpointer data);
 		static void onConnect_gui(GtkButton *widget, gpointer data);
 		static void onToggledClicked_gui(GtkCellRendererToggle *cell, gchar *path, gpointer data);
 

=== modified file 'linux/hub.cc'
--- linux/hub.cc	2008-12-04 05:49:15 +0000
+++ linux/hub.cc	2008-12-14 18:47:18 +0000
@@ -1174,10 +1174,10 @@
 
 	if (address.substr(0, 6) == "adc://" || address.substr(0, 7) == "adcs://")
 		encoding = "UTF-8";
-	else if (encoding.empty() || encoding == WulforUtil::ENCODING_GLOBAL_HUB_DEFAULT)
+	else if (encoding.empty() || encoding == WulforUtil::ENCODING_DEFAULT)
 		encoding = WGETS("default-charset");
 
-	if (encoding == WulforUtil::ENCODING_SYSTEM_DEFAULT)
+	if (encoding == WulforUtil::ENCODING_LOCALE)
 		encoding = Text::getSystemCharset();
 
 	// Only pick "UTF-8" part of "UTF-8 (Unicode)".