[gwget] 2009-06-20 David Sedeño <david alderia com>



commit cafabb357e94b49e6eeb7f855c76786d82873a72
Author: David Sedeño <david alderia com>
Date:   Sat Jun 20 11:19:46 2009 +0200

    2009-06-20  David Sedeño <david alderia com>
    
      * configure.ac, data/Makefile.am, data/gwget.ui, data/preferences.ui,
        src/gwget_data.c, src/main_window.c, src/main_window.h, src/main_window_cb.c,
        src/new_window.c, src/systray.c, src/utils.c
      Mass changes to migrate to gtkbuilder. Thanks to Artur Roma <ari-tczew tlen pl>

 ChangeLog            |    4 +
 configure.ac         |    2 -
 data/Makefile.am     |    4 +-
 data/gwget.ui        | 1036 ++++++++++++++++++++++++++++++++++
 data/preferences.ui  | 1520 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/gwget_data.c     |   60 +-
 src/main_window.c    |   95 ++--
 src/main_window.h    |    7 +-
 src/main_window_cb.c |  245 +++++----
 src/new_window.c     |   21 +-
 src/systray.c        |    2 +-
 src/utils.c          |    7 +-
 12 files changed, 2786 insertions(+), 217 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 2732576..ddccd4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-20  David Sedeño <david alderia com>
+
+  * Mass changes to migrate to gtkbuilder. Thanks to Artur Roma <ari-tczew tlen pl>
+
 2009-06-18  David Sedeño <david alderia com>
 
   * configure.ac, NEWS: Version 1.0.2 
diff --git a/configure.ac b/configure.ac
index 323dd84..4e036c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,6 @@ AM_GCONF_SOURCE_2
 LIBGNOMEUI_REQUIRED=2.0.0
 LIBGNOME_REQUIRED=2.0.0
 GTK_REQUIRED=2.6.0
-LIBGLADE_REQUIRED=2.0.0
 GCONF_REQUIRED=1.1.11
 DBUS_GLIB_REQUIRED=0.33
 GIO_REQUIRED=2.16.0
@@ -25,7 +24,6 @@ GIO_REQUIRED=2.16.0
 PKG_CHECK_MODULES(GNOME, libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
 		 	  gtk+-2.0 	>= $GTK_REQUIRED 
 			  gmodule-2.0
-			  libglade-2.0 	>= $LIBGLADE_REQUIRED
 			  gio-unix-2.0 >= $GIO_REQUIRED)
 			
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 79333e9..bc40855 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,8 +3,8 @@
 gwget_datadir = $(datadir)/@PACKAGE@
 
 gwget_data_DATA = \
-	preferences.glade\
-	gwget.glade
+	preferences.ui\
+	gwget.ui
 
                                                                                                             
 # Dbus service file
diff --git a/data/gwget.ui b/data/gwget.ui
new file mode 100644
index 0000000..93f5ed2
--- /dev/null
+++ b/data/gwget.ui
@@ -0,0 +1,1036 @@
+<?xml version="1.0"?>
+<!--Generated with glade3 3.4.5 on Sun Feb  8 12:35:43 2009 -->
+<interface>
+  <object class="GtkUIManager" id="uimanager1">
+    <child>
+      <object class="GtkActionGroup" id="actiongroup1">
+        <child>
+          <object class="GtkAction" id="menuitem1">
+            <property name="name">menuitem1</property>
+            <property name="label" translatable="yes">_Archive</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="imagemenuitem1">
+            <property name="stock_id">gtk-new</property>
+            <property name="name">imagemenuitem1</property>
+            <signal handler="on_button_new_clicked" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="resume_all_menuitem">
+            <property name="stock_id">gtk-refresh</property>
+            <property name="name">resume_all_menuitem</property>
+            <property name="label" translatable="yes">Resume all</property>
+            <signal handler="continue_all_downloads" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="pause_all_menuitem">
+            <property name="stock_id">gtk-stop</property>
+            <property name="name">pause_all_menuitem</property>
+            <property name="label" translatable="yes">Pause all</property>
+            <signal handler="stop_all_downloads" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="imagemenuitem5">
+            <property name="stock_id">gtk-quit</property>
+            <property name="name">imagemenuitem5</property>
+            <signal handler="on_quit1_activate" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="menuitem2">
+            <property name="name">menuitem2</property>
+            <property name="label" translatable="yes">_Edit</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="imagemenuitem6">
+            <property name="name">imagemenuitem6</property>
+            <property name="label" translatable="yes">Remove from List</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="remove_completed1">
+            <property name="name">remove_completed1</property>
+            <property name="label" translatable="yes">Remove completed</property>
+            <signal handler="on_remove_completed_activate" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="remove_inactive1">
+            <property name="name">remove_inactive1</property>
+            <property name="label" translatable="yes">Remove inactive</property>
+            <signal handler="on_remove_notrunning_activate" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="remove_all1">
+            <property name="name">remove_all1</property>
+            <property name="label" translatable="yes">Remove all</property>
+            <signal handler="on_remove_all_activate" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="menuitem3">
+            <property name="stock_id">gtk-preferences</property>
+            <property name="name">menuitem3</property>
+            <signal handler="on_boton_pref_clicked" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="Download">
+            <property name="name">Download</property>
+            <property name="label" translatable="yes">_Download</property>
+            <signal handler="on_download_menu_activate" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="pause_menuitem">
+            <property name="stock_id">gtk-stop</property>
+            <property name="name">pause_menuitem</property>
+            <property name="tooltip" translatable="yes">Pause the download</property>
+            <property name="label" translatable="yes">Pause</property>
+            <signal handler="on_popup_pause_button_clicked" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="continue_menuitem">
+            <property name="stock_id">gtk-refresh</property>
+            <property name="name">continue_menuitem</property>
+            <property name="tooltip" translatable="yes">Continue with the download</property>
+            <property name="label" translatable="yes">Continue</property>
+            <signal handler="on_popup_continue_activate" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="cancel_menuitem">
+            <property name="stock_id">gtk-cancel</property>
+            <property name="name">cancel_menuitem</property>
+            <property name="tooltip" translatable="yes">Cancel the download</property>
+            <property name="label" translatable="yes">Cancel</property>
+            <signal handler="on_cancel_download_activate" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="properties_menuitem">
+            <property name="stock_id">gtk-properties</property>
+            <property name="name">properties_menuitem</property>
+            <signal handler="on_properties_activate" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="showitem">
+            <property name="name">showitem</property>
+            <property name="label" translatable="yes">_View</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleAction" id="view_toolbar">
+            <property name="name">view_toolbar</property>
+            <property name="label" translatable="yes">_Toolbar</property>
+            <signal handler="on_view_toolbar_activate" name="toggled"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleAction" id="view_statusbar">
+            <property name="name">view_statusbar</property>
+            <property name="label" translatable="yes">Stat_usbar</property>
+            <signal handler="on_view_statusbar_activate" name="toggled"/>
+            <signal handler="on_view_statusbar_activate" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="menuitem4">
+            <property name="name">menuitem4</property>
+            <property name="label" translatable="yes">Help</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="imagemenuitem10">
+            <property name="stock_id">gtk-about</property>
+            <property name="name">imagemenuitem10</property>
+            <signal handler="on_about1_activate" name="activate"/>
+          </object>
+        </child>
+      </object>
+    </child>
+    <ui>
+      <menubar name="menubar1">
+        <menu action="menuitem1">
+          <menuitem action="imagemenuitem1"/>
+          <separator/>
+          <menuitem action="resume_all_menuitem"/>
+          <menuitem action="pause_all_menuitem"/>
+          <separator/>
+          <menuitem action="imagemenuitem5"/>
+        </menu>
+        <menu action="menuitem2">
+          <menu action="imagemenuitem6">
+            <menuitem action="remove_completed1"/>
+            <menuitem action="remove_inactive1"/>
+            <menuitem action="remove_all1"/>
+          </menu>
+          <separator/>
+          <menuitem action="menuitem3"/>
+        </menu>
+        <menu action="Download">
+          <menuitem action="pause_menuitem"/>
+          <menuitem action="continue_menuitem"/>
+          <menuitem action="cancel_menuitem"/>
+          <separator/>
+          <menuitem action="properties_menuitem"/>
+        </menu>
+        <menu action="showitem">
+          <menuitem action="view_toolbar"/>
+          <menuitem action="view_statusbar"/>
+        </menu>
+        <menu action="menuitem4">
+          <menuitem action="imagemenuitem10"/>
+        </menu>
+      </menubar>
+    </ui>
+  </object>
+  <object class="GtkUIManager" id="uimanager2">
+    <child>
+      <object class="GtkActionGroup" id="actiongroup2">
+        <child>
+          <object class="GtkAction" id="pause_download">
+            <property name="stock_id">gtk-stop</property>
+            <property name="name">pause_download</property>
+            <property name="tooltip" translatable="yes">Pause download</property>
+            <property name="label" translatable="yes">Pause</property>
+            <signal handler="on_popup_pause_button_clicked" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="continue_download">
+            <property name="stock_id">gtk-refresh</property>
+            <property name="name">continue_download</property>
+            <property name="tooltip" translatable="yes">Continue download</property>
+            <property name="label" translatable="yes">Continue</property>
+            <signal handler="on_popup_continue_activate" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="open">
+            <property name="name">open</property>
+            <property name="tooltip" translatable="yes">Open file</property>
+            <property name="label" translatable="yes">Open</property>
+            <signal handler="on_open_download_activate" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="open_directory">
+            <property name="stock_id">gtk-open</property>
+            <property name="name">open_directory</property>
+            <property name="tooltip" translatable="yes">Open target directory</property>
+            <property name="label" translatable="yes">Open directory</property>
+            <signal handler="on_open_directory_activate" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="remove">
+            <property name="stock_id">gtk-remove</property>
+            <property name="name">remove</property>
+            <property name="label" translatable="yes">Remove from list</property>
+            <signal handler="on_remove_download_activate" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="cancel_download">
+            <property name="stock_id">gtk-cancel</property>
+            <property name="name">cancel_download</property>
+            <property name="label" translatable="yes">Cancel download</property>
+            <signal handler="on_cancel_download_activate" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="menuitem15">
+            <property name="stock_id">gtk-properties</property>
+            <property name="name">menuitem15</property>
+            <signal handler="on_properties_activate" name="activate"/>
+          </object>
+        </child>
+      </object>
+    </child>
+    <ui>
+      <popup name="popup1">
+        <menuitem action="pause_download"/>
+        <menuitem action="continue_download"/>
+        <separator/>
+        <menuitem action="open"/>
+        <menuitem action="open_directory"/>
+        <separator/>
+        <menuitem action="remove"/>
+        <menuitem action="cancel_download"/>
+        <separator/>
+        <menuitem action="menuitem15"/>
+      </popup>
+    </ui>
+  </object>
+  <object class="GtkWindow" id="main_window">
+    <property name="title" translatable="yes">Gwget - Download Manager</property>
+    <property name="icon">gwget.png</property>
+    <signal handler="on_main_window_delete_event" name="delete_event"/>
+    <child>
+      <object class="GtkVBox" id="vbox1">
+        <property name="visible">True</property>
+        <child>
+          <object class="GtkMenuBar" constructor="uimanager1" id="menubar1">
+            <property name="visible">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkToolbar" id="toolbar1">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkToolButton" id="button_new">
+                <property name="visible">True</property>
+                <property name="tooltip-text" translatable="yes">New download</property>
+                <property name="stock_id">gtk-new</property>
+                <signal handler="on_button_new_clicked" name="clicked"/>
+              </object>
+              <packing>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="resumeall_button">
+                <property name="visible">True</property>
+                <property name="tooltip-text" translatable="yes">Resume all downloads</property>
+                <property name="label" translatable="yes">Resume all</property>
+                <property name="stock_id">gtk-refresh</property>
+                <signal handler="continue_all_downloads" name="clicked"/>
+              </object>
+              <packing>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="stop_button">
+                <property name="visible">True</property>
+                <property name="tooltip-text" translatable="yes">Pause all downloads</property>
+                <property name="label" translatable="yes">Pause all</property>
+                <property name="stock_id">gtk-stop</property>
+                <signal handler="stop_all_downloads" name="clicked"/>
+              </object>
+              <packing>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="clear_button">
+                <property name="visible">True</property>
+                <property name="tooltip-text" translatable="yes">Remove completed downloads</property>
+                <property name="label" translatable="yes">Clear</property>
+                <property name="stock_id">gtk-clear</property>
+                <signal handler="on_remove_completed_activate" name="clicked"/>
+              </object>
+              <packing>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+            <child>
+              <object class="GtkTreeView" id="treeview1">
+                <property name="visible">True</property>
+                <signal handler="on_treeview1_button_press_event" name="button_press_event"/>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkStatusbar" id="statusbar">
+            <property name="visible">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkMenu" constructor="uimanager2" id="popup1">
+    <property name="visible">True</property>
+  </object>
+  <object class="GtkDialog" id="dialog2">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Recursive options</property>
+    <property name="resizable">False</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">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="spacing">2</property>
+        <child>
+          <object class="GtkVBox" id="vbox2">
+            <property name="visible">True</property>
+            <property name="border_width">12</property>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">&lt;b&gt;Download&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+                <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkHBox" id="hbox1">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkLabel" id="label2">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">    </property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkVBox" id="vbox3">
+                    <property name="visible">True</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkRadioButton" id="radio_index">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">The index file only</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="radio_multimedia">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Multimedia files (Videos and images)</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">radio_index</property>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="radio_mirror">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">This site (mirror)</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">radio_index</property>
+                      </object>
+                      <packing>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="radio_recursive">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Recursive</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">radio_index</property>
+                      </object>
+                      <packing>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">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="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkButton" id="okbutton2">
+                <property name="visible">True</property>
+                <property name="label">gtk-ok</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">radio_index</action-widget>
+      <action-widget response="0">radio_multimedia</action-widget>
+      <action-widget response="0">radio_mirror</action-widget>
+      <action-widget response="0">radio_recursive</action-widget>
+      <action-widget response="0">okbutton2</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkWindow" id="properties_window">
+    <property name="title" translatable="yes">Properties</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <child>
+      <object class="GtkVBox" id="vbox4">
+        <property name="visible">True</property>
+        <property name="border_width">12</property>
+        <child>
+          <object class="GtkLabel" id="label3">
+            <property name="visible">True</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">&lt;b&gt;Properties&lt;/b&gt;</property>
+            <property name="use_markup">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" id="hbox2">
+            <property name="visible">True</property>
+            <property name="spacing">8</property>
+            <child>
+              <object class="GtkLabel" id="label4">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">    </property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" id="vbox5">
+                <property name="visible">True</property>
+                <property name="homogeneous">True</property>
+                <child>
+                  <object class="GtkLabel" id="label5">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">URL:</property>
+                    <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label6">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Local File:</property>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label7">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Local Directory:</property>
+                  </object>
+                  <packing>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label8">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Md5 Sum:</property>
+                  </object>
+                  <packing>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" id="vbox6">
+                <property name="visible">True</property>
+                <property name="homogeneous">True</property>
+                <child>
+                  <object class="GtkLabel" id="url_text">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label">url_text</property>
+                    <property name="selectable">True</property>
+                    <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="local_file_text">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label">local_file_text</property>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="local_dir">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label">label</property>
+                  </object>
+                  <packing>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHBox" id="hbox3">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkButton" id="compare_md5">
+                        <property name="visible">True</property>
+                        <signal handler="on_compare_md5_clicked" name="clicked"/>
+                        <child>
+                          <object class="GtkHBox" id="hbox4">
+                            <property name="visible">True</property>
+                            <property name="resize_mode">GTK_RESIZE_IMMEDIATE</property>
+                            <child>
+                              <object class="GtkImage" id="image1">
+                                <property name="visible">True</property>
+                                <property name="stock">gtk-execute</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label9">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Verify...</property>
+                              </object>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="fill">False</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox1">
+            <property name="visible">True</property>
+            <property name="border_width">6</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <object class="GtkButton" id="button1">
+                <property name="visible">True</property>
+                <property name="label">gtk-close</property>
+                <property name="use_stock">True</property>
+                <signal handler="gtk_widget_hide" name="clicked" object="properties_window"/>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkDialog" id="dialog3">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Information</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="skip_pager_hint">True</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox2">
+        <property name="visible">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="spacing">2</property>
+        <child>
+          <object class="GtkHBox" id="hbox5">
+            <property name="visible">True</property>
+            <property name="border_width">12</property>
+            <property name="spacing">12</property>
+            <child>
+              <object class="GtkImage" id="image2">
+                <property name="visible">True</property>
+                <property name="yalign">0</property>
+                <property name="stock">gtk-dialog-info</property>
+                <property name="icon_size">6</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" id="vbox7">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkLabel" id="title_label_inf">
+                    <property name="visible">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="title_label_inf1">
+                    <property name="visible">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area2">
+            <property name="visible">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="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkButton" id="button3">
+                <property name="visible">True</property>
+                <property name="label">gtk-ok</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">button3</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkWindow" id="md5_window">
+    <property name="title" translatable="yes">Compare md5 sum</property>
+    <property name="resizable">False</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="transient_for">properties_window</property>
+    <child>
+      <object class="GtkVBox" id="vbox8">
+        <property name="visible">True</property>
+        <property name="border_width">12</property>
+        <property name="spacing">12</property>
+        <child>
+          <object class="GtkLabel" id="label10">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">&lt;b&gt;Insert MD5 sum to compare with&lt;/b&gt;</property>
+            <property name="use_markup">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" id="hbox6">
+            <property name="visible">True</property>
+            <property name="spacing">8</property>
+            <child>
+              <object class="GtkLabel" id="label11">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Md5 Sum:</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="md5_entry">
+                <property name="visible">True</property>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox2">
+            <property name="visible">True</property>
+            <property name="spacing">8</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <object class="GtkButton" id="button4">
+                <property name="visible">True</property>
+                <property name="label">gtk-cancel</property>
+                <property name="use_stock">True</property>
+                <signal handler="gtk_widget_hide" name="clicked" object="md5_window"/>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="button5">
+                <property name="visible">True</property>
+                <property name="label">gtk-ok</property>
+                <property name="use_stock">True</property>
+                <signal handler="on_md5ok_button_clicked" name="clicked"/>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkWindow" id="new_window">
+    <property name="title" translatable="yes">New Download</property>
+    <property name="resizable">False</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="skip_pager_hint">True</property>
+    <property name="transient_for">main_window</property>
+    <child>
+      <object class="GtkVBox" id="vbox9">
+        <property name="visible">True</property>
+        <property name="border_width">12</property>
+        <property name="spacing">6</property>
+        <child>
+          <object class="GtkFrame" id="frame2">
+            <property name="visible">True</property>
+            <property name="label_xalign">0</property>
+            <property name="label_yalign">0</property>
+            <property name="shadow_type">GTK_SHADOW_NONE</property>
+            <child>
+              <object class="GtkAlignment" id="alignment2">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
+                <property name="top_padding">6</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <object class="GtkTable" id="table2">
+                    <property name="visible">True</property>
+                    <property name="n_rows">2</property>
+                    <property name="n_columns">2</property>
+                    <property name="column_spacing">12</property>
+                    <property name="row_spacing">6</property>
+                    <child>
+                      <object class="GtkHBox" id="hbox7">
+                        <property name="visible">True</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkComboBoxEntry" id="save_in_comboboxentry">
+                            <property name="visible">True</property>
+                            <child internal-child="entry">
+                              <object class="GtkEntry" id="save_in_entry">
+                                <property name="visible">True</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="new_browse_save_in_button1">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label">gtk-open</property>
+                            <property name="use_stock">True</property>
+                            <signal handler="on_new_browse_save_in_button_clicked" name="clicked"/>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <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>
+                        <property name="y_options">GTK_FILL</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="url_entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">*</property>
+                        <property name="activates_default">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="y_options"/>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label12">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="yalign">0</property>
+                        <property name="label" translatable="yes">Save in:</property>
+                      </object>
+                      <packing>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"/>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="etiqueta_url1">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="yalign">0</property>
+                        <property name="label" translatable="yes">URL:</property>
+                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                        <property name="wrap">True</property>
+                      </object>
+                      <packing>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"/>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label13">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
+                <property name="label" translatable="yes">&lt;span weight="bold"&gt;New Download&lt;/span&gt;</property>
+                <property name="use_markup">True</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox3">
+            <property name="visible">True</property>
+            <property name="border_width">6</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <object class="GtkButton" id="cancel_button1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-cancel</property>
+                <property name="use_stock">True</property>
+                <signal handler="on_cancel_button_clicked" name="clicked"/>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="ok_button1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-ok</property>
+                <property name="use_stock">True</property>
+                <signal handler="on_ok_button_clicked" name="clicked"/>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/data/preferences.ui b/data/preferences.ui
new file mode 100644
index 0000000..271aac1
--- /dev/null
+++ b/data/preferences.ui
@@ -0,0 +1,1520 @@
+<?xml version="1.0"?>
+<!--*- mode: xml -*-->
+<interface>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">1000</property>
+    <property name="lower">0</property>
+    <property name="page_increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">1</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">100</property>
+    <property name="lower">0</property>
+    <property name="page_increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">1</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment3">
+    <property name="upper">100</property>
+    <property name="lower">0</property>
+    <property name="page_increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">1</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment4">
+    <property name="upper">100</property>
+    <property name="lower">0</property>
+    <property name="page_increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">5</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment5">
+    <property name="upper">65550</property>
+    <property name="lower">0</property>
+    <property name="page_increment">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">0</property>
+  </object>
+  <object class="GtkWindow" id="pref_window">
+    <property name="title" translatable="yes">Preferences</property>
+    <property name="type">GTK_WINDOW_TOPLEVEL</property>
+    <property name="window_position">GTK_WIN_POS_CENTER</property>
+    <property name="modal">False</property>
+    <property name="resizable">False</property>
+    <property name="destroy_with_parent">False</property>
+    <property name="decorated">True</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="skip_pager_hint">True</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+    <property name="focus_on_map">True</property>
+    <property name="urgency_hint">False</property>
+    <signal handler="on_pref_cancel_button_clicked" last_modification_time="Mon, 13 Sep 2004 08:57:52 GMT" name="delete_event"/>
+    <child>
+      <object class="GtkVBox" id="vbox1">
+        <property name="border_width">12</property>
+        <property name="visible">True</property>
+        <property name="homogeneous">False</property>
+        <property name="spacing">8</property>
+        <child>
+          <object class="GtkNotebook" id="notebook1">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="show_tabs">True</property>
+            <property name="show_border">True</property>
+            <property name="tab_pos">GTK_POS_TOP</property>
+            <property name="scrollable">False</property>
+            <property name="enable_popup">False</property>
+            <child>
+              <object class="GtkVBox" id="vbox6">
+                <property name="border_width">12</property>
+                <property name="visible">True</property>
+                <property name="homogeneous">False</property>
+                <property name="spacing">18</property>
+                <child>
+                  <object class="GtkVBox" id="vbox14">
+                    <property name="visible">True</property>
+                    <property name="homogeneous">False</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="label49">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;span weight="bold"&gt;General&lt;/span&gt;</property>
+                        <property name="use_underline">False</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                        <property name="wrap">False</property>
+                        <property name="selectable">False</property>
+                        <property name="xalign">0</property>
+                        <property name="yalign">0.5</property>
+                        <property name="xpad">0</property>
+                        <property name="ypad">0</property>
+                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                        <property name="width_chars">-1</property>
+                        <property name="single_line_mode">False</property>
+                        <property name="angle">0</property>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkHBox" id="hbox28">
+                        <property name="visible">True</property>
+                        <property name="homogeneous">False</property>
+                        <property name="spacing">0</property>
+                        <child>
+                          <object class="GtkLabel" id="label40">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">   </property>
+                            <property name="use_underline">False</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">0.5</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkVBox" id="vbox14">
+                            <property name="visible">True</property>
+                            <property name="homogeneous">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkHBox" id="hbox35">
+                                <property name="visible">True</property>
+                                <property name="homogeneous">False</property>
+                                <property name="spacing">8</property>
+                                <child>
+                                  <object class="GtkLabel" id="label48">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">Sa_ve in:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">0</property>
+                                    <property name="mnemonic_widget">save_in_entry</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
+                                    <property name="single_line_mode">False</property>
+                                    <property name="angle">0</property>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="save_in_entry">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="editable">True</property>
+                                    <property name="visibility">True</property>
+                                    <property name="max_length">0</property>
+                                    <property name="text" translatable="yes"/>
+                                    <property name="has_frame">True</property>
+                                    <property name="invisible_char">*</property>
+                                    <property name="activates_default">False</property>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="browse_save_in_button">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label">gtk-open</property>
+                                    <property name="use_stock">True</property>
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                                    <property name="focus_on_click">True</property>
+                                    <signal handler="on_browse_save_in_button_clicked" last_modification_time="Wed, 21 Apr 2004 19:23:21 GMT" name="clicked"/>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="hbox99">
+                                <property name="visible">True</property>
+                                <property name="homogeneous">False</property>
+                                <property name="spacing">0</property>
+                                <child>
+                                  <object class="GtkCheckButton" id="ask_save_each_dl_check">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">_Ask where to save for each download</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                                    <property name="focus_on_click">True</property>
+                                    <property name="active">False</property>
+                                    <property name="inconsistent">False</property>
+                                    <property name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="resume_at_start">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">_Continue downloads on startup</property>
+                                <property name="use_underline">True</property>
+                                <property name="relief">GTK_RELIEF_NORMAL</property>
+                                <property name="focus_on_click">True</property>
+                                <property name="active">False</property>
+                                <property name="inconsistent">False</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="hbox29">
+                                <property name="visible">True</property>
+                                <property name="homogeneous">False</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <object class="GtkCheckButton" id="limit_speed_check">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">_Limit download speed to:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                                    <property name="focus_on_click">True</property>
+                                    <property name="active">False</property>
+                                    <property name="inconsistent">False</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal handler="on_limit_speed_check_toggled" last_modification_time="Wed, 28 Jul 2004 19:22:05 GMT" name="toggled"/>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinButton" id="limit_speed_spin">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="climb_rate">1</property>
+                                    <property name="digits">0</property>
+                                    <property name="numeric">True</property>
+                                    <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                    <property name="snap_to_ticks">True</property>
+                                    <property name="wrap">False</property>
+                                    <property name="adjustment">adjustment1</property>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label41">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">kB/sec</property>
+                                    <property name="use_underline">False</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">0.5</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">0</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
+                                    <property name="single_line_mode">False</property>
+                                    <property name="angle">0</property>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="hbox101">
+                                <property name="visible">True</property>
+                                <property name="homogeneous">False</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <object class="GtkCheckButton" id="limit_simultaneousdownloads_check">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">Limit _number of simultaneous download to:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                                    <property name="focus_on_click">True</property>
+                                    <property name="active">False</property>
+                                    <property name="inconsistent">False</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal handler="on_limit_simultaneousdownloads_check_toggled" last_modification_time="Sat, 26 Feb 2005 18:05:28 GMT" name="toggled"/>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinButton" id="limit_simultaneousdownloads_spin">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="climb_rate">1</property>
+                                    <property name="digits">0</property>
+                                    <property name="numeric">True</property>
+                                    <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                    <property name="snap_to_ticks">True</property>
+                                    <property name="wrap">False</property>
+                                    <property name="adjustment">adjustment2</property>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label50">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">files</property>
+                                    <property name="use_underline">False</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">0.5</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">0</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
+                                    <property name="single_line_mode">False</property>
+                                    <property name="angle">0</property>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">True</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="open_after_dl">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">_Open files automatically after download</property>
+                                <property name="use_underline">True</property>
+                                <property name="relief">GTK_RELIEF_NORMAL</property>
+                                <property name="focus_on_click">True</property>
+                                <property name="active">False</property>
+                                <property name="inconsistent">False</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="hbox33">
+                                <property name="visible">True</property>
+                                <property name="homogeneous">False</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <object class="GtkLabel" id="label47">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">_Number of retries:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">0.5</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">0</property>
+                                    <property name="mnemonic_widget">num_retries_spin</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
+                                    <property name="single_line_mode">False</property>
+                                    <property name="angle">0</property>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinButton" id="num_retries_spin">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="climb_rate">1</property>
+                                    <property name="digits">0</property>
+                                    <property name="numeric">False</property>
+                                    <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                    <property name="snap_to_ticks">False</property>
+                                    <property name="wrap">False</property>
+                                    <property name="adjustment">adjustment3</property>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="padding">0</property>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="tab_expand">False</property>
+                <property name="tab_fill">True</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">General</property>
+                <property name="use_underline">False</property>
+                <property name="use_markup">False</property>
+                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                <property name="wrap">False</property>
+                <property name="selectable">False</property>
+                <property name="xalign">0.5</property>
+                <property name="yalign">0.5</property>
+                <property name="xpad">0</property>
+                <property name="ypad">0</property>
+                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                <property name="width_chars">-1</property>
+                <property name="single_line_mode">False</property>
+                <property name="angle">0</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkVBox" id="vbox9">
+                <property name="border_width">12</property>
+                <property name="visible">True</property>
+                <property name="homogeneous">False</property>
+                <property name="spacing">12</property>
+                <child>
+                  <object class="GtkVBox" id="vbox10">
+                    <property name="visible">True</property>
+                    <property name="homogeneous">False</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="label34">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;span weight="bold"&gt;Behavior&lt;/span&gt;</property>
+                        <property name="use_underline">False</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                        <property name="wrap">False</property>
+                        <property name="selectable">False</property>
+                        <property name="xalign">0</property>
+                        <property name="yalign">0.5</property>
+                        <property name="xpad">0</property>
+                        <property name="ypad">0</property>
+                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                        <property name="width_chars">-1</property>
+                        <property name="single_line_mode">False</property>
+                        <property name="angle">0</property>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkHBox" id="hbox24">
+                        <property name="visible">True</property>
+                        <property name="homogeneous">False</property>
+                        <property name="spacing">0</property>
+                        <child>
+                          <object class="GtkLabel" id="label35">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">    </property>
+                            <property name="use_underline">False</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">0.5</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkVBox" id="vbox11">
+                            <property name="visible">True</property>
+                            <property name="homogeneous">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkCheckButton" id="dl_page_requisites">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">_Download page requisites</property>
+                                <property name="use_underline">True</property>
+                                <property name="relief">GTK_RELIEF_NORMAL</property>
+                                <property name="focus_on_click">True</property>
+                                <property name="active">False</property>
+                                <property name="inconsistent">False</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="no_create_directories">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Don't _create directories</property>
+                                <property name="use_underline">True</property>
+                                <property name="relief">GTK_RELIEF_NORMAL</property>
+                                <property name="focus_on_click">True</property>
+                                <property name="active">False</property>
+                                <property name="inconsistent">False</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="hbox25">
+                                <property name="visible">True</property>
+                                <property name="homogeneous">False</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <object class="GtkLabel" id="label36">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">_Maximum depth level:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">0.5</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">0</property>
+                                    <property name="mnemonic_widget">max_depth</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
+                                    <property name="single_line_mode">False</property>
+                                    <property name="angle">0</property>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinButton" id="max_depth">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="climb_rate">1</property>
+                                    <property name="digits">0</property>
+                                    <property name="numeric">False</property>
+                                    <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                    <property name="snap_to_ticks">False</property>
+                                    <property name="wrap">False</property>
+                                    <property name="adjustment">adjustment4</property>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="padding">0</property>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkVBox" id="vbox12">
+                    <property name="visible">True</property>
+                    <property name="homogeneous">False</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="label37">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;span weight="bold"&gt;Links&lt;/span&gt;</property>
+                        <property name="use_underline">False</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                        <property name="wrap">False</property>
+                        <property name="selectable">False</property>
+                        <property name="xalign">0</property>
+                        <property name="yalign">0.5</property>
+                        <property name="xpad">0</property>
+                        <property name="ypad">0</property>
+                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                        <property name="width_chars">-1</property>
+                        <property name="single_line_mode">False</property>
+                        <property name="angle">0</property>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkHBox" id="hbox26">
+                        <property name="visible">True</property>
+                        <property name="homogeneous">False</property>
+                        <property name="spacing">0</property>
+                        <child>
+                          <object class="GtkLabel" id="label38">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">    </property>
+                            <property name="use_underline">False</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">0.5</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkVBox" id="vbox13">
+                            <property name="visible">True</property>
+                            <property name="homogeneous">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkCheckButton" id="follow_relative">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Follow _relative links only</property>
+                                <property name="use_underline">True</property>
+                                <property name="relief">GTK_RELIEF_NORMAL</property>
+                                <property name="focus_on_click">True</property>
+                                <property name="active">False</property>
+                                <property name="inconsistent">False</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="convert_links">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">_Convert links</property>
+                                <property name="use_underline">True</property>
+                                <property name="relief">GTK_RELIEF_NORMAL</property>
+                                <property name="focus_on_click">True</property>
+                                <property name="active">False</property>
+                                <property name="inconsistent">False</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="padding">0</property>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="tab_expand">False</property>
+                <property name="tab_fill">True</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label6">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Recursive</property>
+                <property name="use_underline">False</property>
+                <property name="use_markup">False</property>
+                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                <property name="wrap">False</property>
+                <property name="selectable">False</property>
+                <property name="xalign">0.5</property>
+                <property name="yalign">0.5</property>
+                <property name="xpad">0</property>
+                <property name="ypad">0</property>
+                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                <property name="width_chars">-1</property>
+                <property name="single_line_mode">False</property>
+                <property name="angle">0</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkVBox" id="vbox15">
+                <property name="border_width">12</property>
+                <property name="visible">True</property>
+                <property name="homogeneous">False</property>
+                <property name="spacing">12</property>
+                <child>
+                  <object class="GtkVBox" id="vbox16">
+                    <property name="visible">True</property>
+                    <property name="homogeneous">False</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkHBox" id="hbox30">
+                        <property name="visible">True</property>
+                        <property name="homogeneous">False</property>
+                        <property name="spacing">0</property>
+                        <child>
+                          <object class="GtkLabel" id="label43">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">&lt;span weight="bold"&gt;Proxy Configuration&lt;/span&gt;</property>
+                            <property name="use_underline">False</property>
+                            <property name="use_markup">True</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">0.5</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkHBox" id="hbox31">
+                        <property name="visible">True</property>
+                        <property name="homogeneous">False</property>
+                        <property name="spacing">0</property>
+                        <child>
+                          <object class="GtkLabel" id="label44">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">    </property>
+                            <property name="use_underline">False</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">0.5</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkVBox" id="vbox17">
+                            <property name="visible">True</property>
+                            <property name="homogeneous">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkRadioButton" id="direct_radio">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Direct _Internet connection</property>
+                                <property name="use_underline">True</property>
+                                <property name="relief">GTK_RELIEF_NORMAL</property>
+                                <property name="focus_on_click">True</property>
+                                <property name="active">False</property>
+                                <property name="inconsistent">False</property>
+                                <property name="draw_indicator">True</property>
+                                <signal handler="on_direct_radio_toggled" last_modification_time="Fri, 05 Nov 2004 22:18:19 GMT" name="toggled"/>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkRadioButton" id="default_radio">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Default _GNOME network settings</property>
+                                <property name="use_underline">True</property>
+                                <property name="relief">GTK_RELIEF_NORMAL</property>
+                                <property name="focus_on_click">True</property>
+                                <property name="active">False</property>
+                                <property name="inconsistent">False</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">direct_radio</property>
+                                <signal handler="on_default_radio_toggled" last_modification_time="Fri, 05 Nov 2004 22:18:28 GMT" name="toggled"/>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkRadioButton" id="manual_radio">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">_Manual proxy configuration</property>
+                                <property name="use_underline">True</property>
+                                <property name="relief">GTK_RELIEF_NORMAL</property>
+                                <property name="focus_on_click">True</property>
+                                <property name="active">False</property>
+                                <property name="inconsistent">False</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">direct_radio</property>
+                                <signal handler="on_manual_radio_toggled" last_modification_time="Fri, 05 Nov 2004 22:18:37 GMT" name="toggled"/>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="hbox32">
+                                <property name="visible">True</property>
+                                <property name="homogeneous">False</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <object class="GtkLabel" id="label45">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">Pro_xy:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">0.5</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">0</property>
+                                    <property name="mnemonic_widget">http_proxy_entry</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
+                                    <property name="single_line_mode">False</property>
+                                    <property name="angle">0</property>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="http_proxy_entry">
+                                    <property name="visible">True</property>
+                                    <property name="sensitive">False</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="editable">True</property>
+                                    <property name="visibility">True</property>
+                                    <property name="max_length">0</property>
+                                    <property name="text" translatable="yes"/>
+                                    <property name="has_frame">True</property>
+                                    <property name="invisible_char">*</property>
+                                    <property name="activates_default">False</property>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label46">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">P_ort:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">0.5</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">0</property>
+                                    <property name="mnemonic_widget">http_proxy_port_spin</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
+                                    <property name="single_line_mode">False</property>
+                                    <property name="angle">0</property>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinButton" id="http_proxy_port_spin">
+                                    <property name="visible">True</property>
+                                    <property name="sensitive">False</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="climb_rate">1</property>
+                                    <property name="digits">0</property>
+                                    <property name="numeric">False</property>
+                                    <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                    <property name="snap_to_ticks">False</property>
+                                    <property name="wrap">False</property>
+                                    <property name="adjustment">adjustment5</property>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="proxy_uses_auth_radio">
+                                <property name="visible">True</property>
+                                <property name="sensitive">False</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">_Proxy requires authentication</property>
+                                <property name="use_underline">True</property>
+                                <property name="relief">GTK_RELIEF_NORMAL</property>
+                                <property name="focus_on_click">True</property>
+                                <property name="active">False</property>
+                                <property name="inconsistent">False</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="hbox102">
+                                <property name="visible">True</property>
+                                <property name="homogeneous">False</property>
+                                <property name="spacing">5</property>
+                                <child>
+                                  <object class="GtkLabel" id="label51">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">_User:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">0.5</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">0</property>
+                                    <property name="mnemonic_widget">proxy_user</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
+                                    <property name="single_line_mode">False</property>
+                                    <property name="angle">0</property>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="proxy_user">
+                                    <property name="visible">True</property>
+                                    <property name="sensitive">False</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="editable">True</property>
+                                    <property name="visibility">True</property>
+                                    <property name="max_length">0</property>
+                                    <property name="text" translatable="yes"/>
+                                    <property name="has_frame">True</property>
+                                    <property name="invisible_char">*</property>
+                                    <property name="activates_default">False</property>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label52">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">Password:</property>
+                                    <property name="use_underline">False</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">0.5</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">0</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
+                                    <property name="single_line_mode">False</property>
+                                    <property name="angle">0</property>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="proxy_password">
+                                    <property name="visible">True</property>
+                                    <property name="sensitive">False</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="editable">True</property>
+                                    <property name="visibility">False</property>
+                                    <property name="max_length">0</property>
+                                    <property name="text" translatable="yes"/>
+                                    <property name="has_frame">True</property>
+                                    <property name="invisible_char">*</property>
+                                    <property name="activates_default">False</property>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="padding">0</property>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="tab_expand">False</property>
+                <property name="tab_fill">True</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label42">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Network</property>
+                <property name="use_underline">False</property>
+                <property name="use_markup">False</property>
+                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                <property name="wrap">False</property>
+                <property name="selectable">False</property>
+                <property name="xalign">0.5</property>
+                <property name="yalign">0.5</property>
+                <property name="xpad">0</property>
+                <property name="ypad">0</property>
+                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                <property name="width_chars">-1</property>
+                <property name="single_line_mode">False</property>
+                <property name="angle">0</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkVBox" id="vbox4">
+                <property name="border_width">12</property>
+                <property name="visible">True</property>
+                <property name="homogeneous">False</property>
+                <property name="spacing">12</property>
+                <child>
+                  <object class="GtkHBox" id="hbox19">
+                    <property name="visible">True</property>
+                    <property name="homogeneous">False</property>
+                    <property name="spacing">0</property>
+                    <child>
+                      <object class="GtkLabel" id="label29">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;span weight="bold"&gt;Column List&lt;/span&gt;</property>
+                        <property name="use_underline">False</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                        <property name="wrap">False</property>
+                        <property name="selectable">False</property>
+                        <property name="xalign">0.5</property>
+                        <property name="yalign">0.5</property>
+                        <property name="xpad">0</property>
+                        <property name="ypad">0</property>
+                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                        <property name="width_chars">-1</property>
+                        <property name="single_line_mode">False</property>
+                        <property name="angle">0</property>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="padding">0</property>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHBox" id="hbox18">
+                    <property name="visible">True</property>
+                    <property name="homogeneous">False</property>
+                    <property name="spacing">0</property>
+                    <child>
+                      <object class="GtkLabel" id="label28">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">    </property>
+                        <property name="use_underline">False</property>
+                        <property name="use_markup">False</property>
+                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                        <property name="wrap">False</property>
+                        <property name="selectable">False</property>
+                        <property name="xalign">0.5</property>
+                        <property name="yalign">0.5</property>
+                        <property name="xpad">0</property>
+                        <property name="ypad">0</property>
+                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                        <property name="width_chars">-1</property>
+                        <property name="single_line_mode">False</property>
+                        <property name="angle">0</property>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkVBox" id="vbox5">
+                        <property name="visible">True</property>
+                        <property name="homogeneous">False</property>
+                        <property name="spacing">12</property>
+                        <child>
+                          <object class="GtkCheckButton" id="check_actual_size">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">_Current Size</property>
+                            <property name="use_underline">True</property>
+                            <property name="relief">GTK_RELIEF_NORMAL</property>
+                            <property name="focus_on_click">True</property>
+                            <property name="active">False</property>
+                            <property name="inconsistent">False</property>
+                            <property name="draw_indicator">True</property>
+                            <signal handler="on_check_actual_size_toggled" last_modification_time="Thu, 29 Apr 2004 18:53:51 GMT" name="toggled"/>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="check_total_size">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Total _Size</property>
+                            <property name="use_underline">True</property>
+                            <property name="relief">GTK_RELIEF_NORMAL</property>
+                            <property name="focus_on_click">True</property>
+                            <property name="active">False</property>
+                            <property name="inconsistent">False</property>
+                            <property name="draw_indicator">True</property>
+                            <signal handler="on_check_total_size_toggled" last_modification_time="Fri, 30 Apr 2004 15:48:40 GMT" name="toggled"/>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="check_percentage">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">_Percentage</property>
+                            <property name="use_underline">True</property>
+                            <property name="relief">GTK_RELIEF_NORMAL</property>
+                            <property name="focus_on_click">True</property>
+                            <property name="active">False</property>
+                            <property name="inconsistent">False</property>
+                            <property name="draw_indicator">True</property>
+                            <signal handler="on_check_percentage_toggled" last_modification_time="Fri, 30 Apr 2004 15:49:33 GMT" name="toggled"/>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="check_elapse_time">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">_Elapsed Time</property>
+                            <property name="use_underline">True</property>
+                            <property name="relief">GTK_RELIEF_NORMAL</property>
+                            <property name="focus_on_click">True</property>
+                            <property name="active">False</property>
+                            <property name="inconsistent">False</property>
+                            <property name="draw_indicator">True</property>
+                            <signal handler="on_check_elapse_time_toggled" last_modification_time="Fri, 30 Apr 2004 15:52:00 GMT" name="toggled"/>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="check_rem_time">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Remaining _Time</property>
+                            <property name="use_underline">True</property>
+                            <property name="relief">GTK_RELIEF_NORMAL</property>
+                            <property name="focus_on_click">True</property>
+                            <property name="active">False</property>
+                            <property name="inconsistent">False</property>
+                            <property name="draw_indicator">True</property>
+                            <signal handler="on_check_rem_time_toggled" last_modification_time="Fri, 30 Apr 2004 15:52:51 GMT" name="toggled"/>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="check_down_speed">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Do_wnload Speed</property>
+                            <property name="use_underline">True</property>
+                            <property name="relief">GTK_RELIEF_NORMAL</property>
+                            <property name="focus_on_click">True</property>
+                            <property name="active">False</property>
+                            <property name="inconsistent">False</property>
+                            <property name="draw_indicator">True</property>
+                            <signal handler="on_check_down_speed_toggled" last_modification_time="Fri, 30 Apr 2004 15:55:29 GMT" name="toggled"/>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="padding">0</property>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="tab_expand">False</property>
+                <property name="tab_fill">True</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label26">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Column List</property>
+                <property name="use_underline">False</property>
+                <property name="use_markup">False</property>
+                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                <property name="wrap">False</property>
+                <property name="selectable">False</property>
+                <property name="xalign">0.5</property>
+                <property name="yalign">0.5</property>
+                <property name="xpad">0</property>
+                <property name="ypad">0</property>
+                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                <property name="width_chars">-1</property>
+                <property name="single_line_mode">False</property>
+                <property name="angle">0</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox1">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="spacing">0</property>
+            <child>
+              <object class="GtkButton" id="pref_ok_button">
+                <property name="visible">True</property>
+                <property name="can_default">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-close</property>
+                <property name="use_stock">True</property>
+                <property name="relief">GTK_RELIEF_NORMAL</property>
+                <property name="focus_on_click">True</property>
+                <signal handler="on_pref_ok_button_clicked" last_modification_time="Wed, 28 May 2003 21:36:25 GMT" name="clicked"/>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/src/gwget_data.c b/src/gwget_data.c
index fa63b77..0988599 100644
--- a/src/gwget_data.c
+++ b/src/gwget_data.c
@@ -225,7 +225,7 @@ gwget_data_update_statistics (GwgetData *gwgetdata)
 		
 	gwget_data_update_statistics_ui(gwgetdata);
 	if (gwgetdata == gwget_data_get_selected() || count_download_in_progress() == 1 ) {
-		gtk_window_set_title(GTK_WINDOW(glade_xml_get_widget(xml, "main_window")), title);
+		gtk_window_set_title(GTK_WINDOW(GTK_WIDGET (gtk_builder_get_object(builder, "main_window"))), title);
 	}
 
 
@@ -599,7 +599,7 @@ GwgetData* gwget_data_get_selected(void)
 	GwgetData *gwgetdata;
 	gchar *url;
 	
-	treev=glade_xml_get_widget(xml,"treeview1");
+	treev=GTK_WIDGET (gtk_builder_get_object(builder,"treeview1"));
 	select=gtk_tree_view_get_selection(GTK_TREE_VIEW(treev));
 	
 	if (gtk_tree_selection_get_selected (select, &model, &iter)) 
@@ -702,25 +702,25 @@ gwget_data_add_download(GwgetData *gwgetdata)
 	if (!strcmp(gwgetdata->filename,"") || !strcmp(gwgetdata->filename,gwgetdata->url) ||
 		!strncmp(reverse_filename,"lmth",4) || !strncmp(reverse_filename,"mth",3) || 
 		!strncmp(reverse_filename,"php",3)  || !strncmp(reverse_filename,"asp",3)) {
-		recursive_window=glade_xml_get_widget(xml,"dialog2");
+		recursive_window=GTK_WIDGET (gtk_builder_get_object(builder,"dialog2"));
 		response=gtk_dialog_run(GTK_DIALOG(recursive_window));
 		gtk_widget_hide(GTK_WIDGET(recursive_window));
 		if (response==GTK_RESPONSE_OK) {
-			radio=glade_xml_get_widget(xml,"radio_index");
+			radio=GTK_WIDGET (gtk_builder_get_object(builder,"radio_index"));
 			if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(radio))) {
 				gwgetdata->recursive=FALSE;
 			}
-			radio=glade_xml_get_widget(xml,"radio_multimedia");
+			radio=GTK_WIDGET (gtk_builder_get_object(builder,"radio_multimedia"));
 			if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(radio))) {
 				gwgetdata->recursive=TRUE;
 				gwgetdata->multimedia=TRUE;
 			}
-			radio=glade_xml_get_widget(xml,"radio_mirror");
+			radio=GTK_WIDGET (gtk_builder_get_object(builder,"radio_mirror"));
 			if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(radio))) {
 				gwgetdata->recursive=TRUE;
 				gwgetdata->mirror=TRUE;
 			}
-			radio=glade_xml_get_widget(xml,"radio_recursive");
+			radio=GTK_WIDGET (gtk_builder_get_object(builder,"radio_recursive"));
 			if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(radio))) {
 				gwgetdata->recursive=TRUE;
 			}
@@ -792,7 +792,7 @@ gwget_download_finished (GwgetData *gwgetdata)
 {
 	gwget_gnotify_finished(gwgetdata);
 	gwget_tray_notify (_("Download Complete"), gwgetdata->filename, gwgetdata->icon_name);
-	gtk_widget_set_sensitive(glade_xml_get_widget(xml, "clear_button"), TRUE);
+	gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder, "clear_button")), TRUE);
 
 	if (gwget_ask_download_playlist(gwgetdata))
 		gwget_download_playlist_items(gwgetdata->local_filename);
@@ -845,23 +845,23 @@ gwget_data_set_menus (GwgetData *gwgetdata)
 
 	if (gwgetdata!=NULL) {
 		if (gwget_data_run(gwgetdata)) {
-			gtk_widget_set_sensitive(glade_xml_get_widget(xml,"pause_menuitem"),TRUE);
-			gtk_widget_set_sensitive(glade_xml_get_widget(xml,"continue_menuitem"),FALSE);
-			gtk_widget_set_sensitive(glade_xml_get_widget(xml,"cancel_menuitem"),TRUE);
+			gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder,"pause_menuitem")),TRUE);
+			gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder,"continue_menuitem")),FALSE);
+			gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder,"cancel_menuitem")),TRUE);
 		} else {
 			if (gwgetdata->state==DL_COMPLETED) {
-				gtk_widget_set_sensitive(glade_xml_get_widget(xml,"continue_menuitem"),FALSE);
-				gtk_widget_set_sensitive(glade_xml_get_widget(xml,"pause_menuitem"),FALSE);
-				gtk_widget_set_sensitive(glade_xml_get_widget(xml,"cancel_menuitem"),FALSE);
+				gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder,"continue_menuitem")),FALSE);
+				gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder,"pause_menuitem")),FALSE);
+				gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder,"cancel_menuitem")),FALSE);
 			} else {
-				gtk_widget_set_sensitive(glade_xml_get_widget(xml,"continue_menuitem"),TRUE);
-				gtk_widget_set_sensitive(glade_xml_get_widget(xml,"pause_menuitem"),FALSE);
+				gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder,"continue_menuitem")),TRUE);
+				gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder,"pause_menuitem")),FALSE);
 			}
 		}
 	} else {
-		gtk_widget_set_sensitive(glade_xml_get_widget(xml,"continue_menuitem"),FALSE);
-		gtk_widget_set_sensitive(glade_xml_get_widget(xml,"pause_menuitem"),FALSE);
-		gtk_widget_set_sensitive(glade_xml_get_widget(xml,"cancel_menuitem"),FALSE);
+		gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder,"continue_menuitem")),FALSE);
+		gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder,"pause_menuitem")),FALSE);
+		gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder,"cancel_menuitem")),FALSE);
 	}
 }
 
@@ -870,22 +870,22 @@ gwget_data_set_popupmenu (GwgetData *gwgetdata)
 {
 	if (gwgetdata!=NULL) {
 		if (gwget_data_run(gwgetdata)) {
-			gtk_widget_set_sensitive(glade_xml_get_widget(xml,"pause_download"),TRUE);
-                        gtk_widget_set_sensitive(glade_xml_get_widget(xml,"continue_download"),FALSE);
-                        gtk_widget_set_sensitive(glade_xml_get_widget(xml,"cancel_download"),TRUE);
+			gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder,"pause_download")),TRUE);
+                        gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder,"continue_download")),FALSE);
+                        gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder,"cancel_download")),TRUE);
 		} else {
 			if (gwgetdata->state==DL_COMPLETED) {
-                                gtk_widget_set_sensitive(glade_xml_get_widget(xml,"continue_download"),FALSE);
-                                gtk_widget_set_sensitive(glade_xml_get_widget(xml,"pause_download"),FALSE);
-                                gtk_widget_set_sensitive(glade_xml_get_widget(xml,"cancel_download"),FALSE);
+                                gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder,"continue_download")),FALSE);
+                                gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder,"pause_download")),FALSE);
+                                gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder,"cancel_download")),FALSE);
                         } else {
-                                gtk_widget_set_sensitive(glade_xml_get_widget(xml,"continue_download"),TRUE);
-                                gtk_widget_set_sensitive(glade_xml_get_widget(xml,"pause_download"),FALSE);
+                                gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder,"continue_download")),TRUE);
+                                gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder,"pause_download")),FALSE);
                         }
 		}
 	} else {
-                gtk_widget_set_sensitive(glade_xml_get_widget(xml,"continue_download"),FALSE);
-                gtk_widget_set_sensitive(glade_xml_get_widget(xml,"pause_download"),FALSE);
-                gtk_widget_set_sensitive(glade_xml_get_widget(xml,"cancel_download"),FALSE);
+                gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder,"continue_download")),FALSE);
+                gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder,"pause_download")),FALSE);
+                gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder,"cancel_download")),FALSE);
         }
 }
diff --git a/src/main_window.c b/src/main_window.c
index fd90bef..14fbc4f 100644
--- a/src/main_window.c
+++ b/src/main_window.c
@@ -15,7 +15,6 @@
  */
  
 #include <config.h>
-#include <glade/glade.h>
 #include <gnome.h>
 #include <gconf/gconf-client.h>
 #include <glib/gstdio.h>
@@ -59,20 +58,24 @@ void
 main_window(void) 
 {
 	GtkWidget * window = NULL;
-	gchar *xml_file = NULL,*toolbar_setting;
+	gchar *builder_file = NULL,*toolbar_setting;
 	GtkWidget *treev,*toolbar,*menu_item, *combo;
 	GtkTreeSelection *select;
-	
-
-	if (!xml) {
-		xml_file=g_build_filename(DATADIR,"gwget.glade",NULL);
-		xml = glade_xml_new(xml_file,NULL,NULL);
-	
-		glade_xml_signal_autoconnect(xml);
+	GError* error = NULL;
+
+	if (!builder) {
+		builder_file=g_build_filename(DATADIR,"gwget.ui",NULL);
+		builder = gtk_builder_new();
+		if (!gtk_builder_add_from_file (builder, builder_file, &error))
+			{
+				g_warning ("Couldn't load builder file: s");
+				g_error_free (error);
+			}
+		gtk_builder_connect_signals(builder, NULL);
 	}
 	
-	window = glade_xml_get_widget(xml,"main_window");
-	treev = glade_xml_get_widget(xml,"treeview1");
+	window = GTK_WIDGET (gtk_builder_get_object(builder,"main_window"));
+	treev = GTK_WIDGET (gtk_builder_get_object(builder,"treeview1"));
 	model = create_model();
 	gtk_tree_view_set_model(GTK_TREE_VIEW(treev),GTK_TREE_MODEL(model));
 	select = gtk_tree_view_get_selection (GTK_TREE_VIEW (treev));
@@ -113,7 +116,7 @@ main_window(void)
 			 GUINT_TO_POINTER(dnd_type));	
 					 
 	/* Set the toolbar like gnome preferences */
-	toolbar = glade_xml_get_widget(xml,"toolbar1");
+	toolbar = GTK_WIDGET (gtk_builder_get_object(builder,"toolbar1"));
 	toolbar_setting = gconf_client_get_string(gconf_client,"/desktop/gnome/interface/toolbar_style",NULL);
 	
 	if (!strcmp(toolbar_setting,"icons")) {
@@ -141,9 +144,9 @@ main_window(void)
 				NULL);
 	
 	/* Show the toolbar ? */
-	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(glade_xml_get_widget(xml,"view_toolbar")),gwget_pref.view_toolbar);
-	toolbar = glade_xml_get_widget(xml,"toolbar1"); 
-	menu_item=glade_xml_get_widget(GLADE_XML(xml),"view_toolbar");
+	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM (gtk_builder_get_object(builder,"view_toolbar")),gwget_pref.view_toolbar);
+	toolbar = GTK_WIDGET (gtk_builder_get_object(builder,"toolbar1"));
+	menu_item = GTK_WIDGET (gtk_builder_get_object(builder,"view_toolbar"));
 	if (gwget_pref.trayonly) {
 		gtk_widget_show(GTK_WIDGET(window));
 		gtk_widget_hide(GTK_WIDGET(window));
@@ -158,19 +161,19 @@ main_window(void)
 	}
 
 	/* Show the statusbar ? */
-	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(glade_xml_get_widget(xml,"view_statusbar")), gwget_pref.view_statusbar);
-	menu_item=glade_xml_get_widget(GLADE_XML(xml),"view_statusbar");
+	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM (gtk_builder_get_object(builder,"view_statusbar")), gwget_pref.view_statusbar);
+	menu_item = GTK_WIDGET (gtk_builder_get_object(builder,"view_statusbar"));
 	if (gwget_pref.view_statusbar)
 	{
-		gtk_widget_show (GTK_WIDGET(glade_xml_get_widget(xml, "statusbar")));
+		gtk_widget_show (GTK_WIDGET(GTK_WIDGET (gtk_builder_get_object(builder, "statusbar"))));
 	} else {
-		gtk_widget_hide (GTK_WIDGET(glade_xml_get_widget(xml, "statusbar")));
+		gtk_widget_hide (GTK_WIDGET(GTK_WIDGET (gtk_builder_get_object(builder, "statusbar"))));
 	}
 
 	if (there_are_completed_on_startup) {
-		gtk_widget_set_sensitive (glade_xml_get_widget (xml, "clear_button"), TRUE);
+		gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "clear_button")), TRUE);
 	} else {
-		gtk_widget_set_sensitive (glade_xml_get_widget (xml, "clear_button"), FALSE);
+		gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "clear_button")), FALSE);
 	}
 
 	systray_load();
@@ -178,7 +181,7 @@ main_window(void)
 
 	/* Create the model for the "save in" option in new download dialog */
 	save_in_model = (GtkTreeModel*)gtk_list_store_new (1, G_TYPE_STRING);
-	combo = glade_xml_get_widget (xml, "save_in_comboboxentry");
+	combo = GTK_WIDGET (gtk_builder_get_object (builder, "save_in_comboboxentry"));
 	gtk_combo_box_set_model(GTK_COMBO_BOX(combo), save_in_model);
 	gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY(combo), 0);
 	gtk_entry_set_text(GTK_ENTRY(GTK_BIN(combo)->child), gwget_pref.download_dir);
@@ -353,10 +356,10 @@ gwget_get_defaults_from_gconf(void)
 	/* Default width and height */
 	default_width=gconf_client_get_int (gconf_client,"/apps/gwget2/default_width",NULL);
 	default_height=gconf_client_get_int (gconf_client,"/apps/gwget2/default_height",NULL);
-	gtk_window_resize (GTK_WINDOW (glade_xml_get_widget(xml,"main_window")),default_width,default_height);
+	gtk_window_resize (GTK_WINDOW (gtk_builder_get_object(builder,"main_window")),default_width,default_height);
 	
 	/* Default position */
-	gtk_window_move(GTK_WINDOW(glade_xml_get_widget(xml,"main_window")),
+	gtk_window_move(GTK_WINDOW(GTK_WIDGET (gtk_builder_get_object(builder,"main_window"))),
 					gconf_client_get_int (gconf_client,"/apps/gwget2/position_x",NULL),
 					gconf_client_get_int (gconf_client,"/apps/gwget2/position_y",NULL)
 					);
@@ -581,7 +584,7 @@ gwget_gconf_notify_toolbar(GConfClient *client,
 	
 	value = gconf_entry_get_value (entry);
 	
-	toolbar = glade_xml_get_widget(xml,"toolbar1");
+	toolbar = GTK_WIDGET (gtk_builder_get_object(builder,"toolbar1"));
 	toolbar_setting = (gchar *)gconf_value_get_string(value);
 	
 	if (!strcmp(toolbar_setting,"icons")) {
@@ -607,18 +610,24 @@ static void
 show_prefered_columns(void)
 {	
 	GtkWidget *treev,*column,*checkitem;
-	gchar *xml_file=NULL;
-	
-	if (!xml_pref) {
-		xml_file=g_build_filename(DATADIR,"preferences.glade",NULL);
-		xml_pref = glade_xml_new(xml_file,NULL,NULL);
-		glade_xml_signal_autoconnect(xml_pref);
+	gchar *builder_file=NULL;
+	
+	if (!builder_pref) {
+		GError* error = NULL;
+		builder_file=g_build_filename(DATADIR,"preferences.ui",NULL);
+		builder_pref = gtk_builder_new();
+		if (!gtk_builder_add_from_file (builder, builder_file, &error))
+			{
+				g_warning ("Couldn't load builder file: s");
+				g_error_free (error);
+			}
+		gtk_builder_connect_signals(builder_pref, NULL);
 	}
 	
-	treev = glade_xml_get_widget(xml,"treeview1");
+	treev = GTK_WIDGET (gtk_builder_get_object(builder,"treeview1"));
 	
 	column=(GtkWidget *)gtk_tree_view_get_column(GTK_TREE_VIEW(treev),CURRENTSIZE_COLUMN-2);
-	checkitem=glade_xml_get_widget(xml_pref,"check_actual_size");
+	checkitem=GTK_WIDGET (gtk_builder_get_object(builder_pref,"check_actual_size"));
 	if (gwget_pref.view_actual_size) {
 		gtk_tree_view_column_set_visible(GTK_TREE_VIEW_COLUMN(column),TRUE);
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkitem),TRUE);
@@ -628,7 +637,7 @@ show_prefered_columns(void)
 	}
 	
 	column=(GtkWidget *)gtk_tree_view_get_column(GTK_TREE_VIEW(treev),TOTALSIZE_COLUMN-2);
-	checkitem=glade_xml_get_widget(xml_pref,"check_total_size");
+	checkitem=GTK_WIDGET (gtk_builder_get_object(builder_pref,"check_total_size"));
 	if (gwget_pref.view_total_size) {
 		gtk_tree_view_column_set_visible(GTK_TREE_VIEW_COLUMN(column),TRUE);
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkitem),TRUE);
@@ -638,7 +647,7 @@ show_prefered_columns(void)
 	}
 	
 	column=(GtkWidget *)gtk_tree_view_get_column(GTK_TREE_VIEW(treev),PERCENTAGE_COLUMN-2);
-	checkitem=glade_xml_get_widget(xml_pref,"check_percentage");
+	checkitem=GTK_WIDGET (gtk_builder_get_object(builder_pref,"check_percentage"));
 	if (gwget_pref.view_percentage) {
 		gtk_tree_view_column_set_visible(GTK_TREE_VIEW_COLUMN(column), TRUE);
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkitem), TRUE);
@@ -648,7 +657,7 @@ show_prefered_columns(void)
 	}
 	
 	column=(GtkWidget *)gtk_tree_view_get_column(GTK_TREE_VIEW(treev),ELAPSETIME_COLUMN-3);
-	checkitem=glade_xml_get_widget(xml_pref,"check_elapse_time");
+	checkitem=GTK_WIDGET (gtk_builder_get_object(builder_pref,"check_elapse_time"));
 	if (gwget_pref.view_elapse_time) {
 		gtk_tree_view_column_set_visible(GTK_TREE_VIEW_COLUMN(column), TRUE);
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkitem),TRUE);
@@ -658,7 +667,7 @@ show_prefered_columns(void)
 	}
 	
 	column=(GtkWidget *)gtk_tree_view_get_column(GTK_TREE_VIEW(treev),REMAINTIME_COLUMN-5);
-	checkitem=glade_xml_get_widget(xml_pref,"check_rem_time");
+	checkitem=GTK_WIDGET (gtk_builder_get_object(builder_pref,"check_rem_time"));
 	if (gwget_pref.view_rem_time) {
 		gtk_tree_view_column_set_visible(GTK_TREE_VIEW_COLUMN(column), TRUE);
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkitem),TRUE);
@@ -668,7 +677,7 @@ show_prefered_columns(void)
 	}
 	
 	column=(GtkWidget *)gtk_tree_view_get_column(GTK_TREE_VIEW(treev),SPEED_COLUMN-7);
-	checkitem=glade_xml_get_widget(xml_pref,"check_down_speed");
+	checkitem=GTK_WIDGET (gtk_builder_get_object(builder_pref,"check_down_speed"));
 	if (gwget_pref.view_down_speed) {
 		gtk_tree_view_column_set_visible(GTK_TREE_VIEW_COLUMN(column), TRUE);
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkitem), TRUE);
@@ -677,23 +686,23 @@ show_prefered_columns(void)
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkitem), FALSE);
 	}
 	
-	checkitem = glade_xml_get_widget(xml_pref,"limit_speed_check");
+	checkitem = GTK_WIDGET (gtk_builder_get_object(builder_pref,"limit_speed_check"));
 	if (gwget_pref.limit_speed) {
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkitem),TRUE);
 	} else {
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkitem),FALSE);
 	}
-	checkitem = glade_xml_get_widget(xml_pref,"limit_speed_spin");
+	checkitem = GTK_WIDGET (gtk_builder_get_object(builder_pref,"limit_speed_spin"));
 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(checkitem), (gdouble)gwget_pref.max_speed);
 
 
-	checkitem = glade_xml_get_widget(xml_pref,"limit_simultaneousdownloads_check");
+	checkitem = GTK_WIDGET (gtk_builder_get_object(builder_pref,"limit_simultaneousdownloads_check"));
 	if (gwget_pref.limit_simultaneousdownloads) {
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkitem),TRUE);
 	} else {
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkitem),FALSE);
 	}
-	checkitem = glade_xml_get_widget(xml_pref,"limit_simultaneousdownloads_spin");
+	checkitem = GTK_WIDGET (gtk_builder_get_object(builder_pref,"limit_simultaneousdownloads_spin"));
 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(checkitem), (gdouble)gwget_pref.max_simultaneousdownloads);
 
 }
@@ -711,7 +720,7 @@ gwget_remember_window_size_and_position(void)
 	GConfChangeSet *cs;
 
 	/* Remember the size of the window */
-	main_window=glade_xml_get_widget(xml,"main_window");
+	main_window=GTK_WIDGET (gtk_builder_get_object(builder,"main_window"));
 	allocation= &(GTK_WIDGET (main_window)->allocation);
 	cs = gconf_change_set_new ();
 	gconf_change_set_set_int (cs, "/apps/gwget2/default_height", allocation->height);
diff --git a/src/main_window.h b/src/main_window.h
index d5c4070..5abea44 100644
--- a/src/main_window.h
+++ b/src/main_window.h
@@ -18,7 +18,6 @@
 #define _MAIN_WINDOW_H
 
 #include <gconf/gconf-client.h>
-#include <glade/glade.h>
 #include <gtk/gtk.h>
 
 enum {
@@ -61,10 +60,10 @@ static  GtkTargetEntry dragtypes[] = {
 		{ "_NETSCAPE_URL", 	0, TARGET_NETSCAPE_URL }
 };
 
-GladeXML *xml;
+GtkBuilder *builder;
 
 /* xml of the new download window */
-GladeXML *xml_new;
+GtkBuilder *builder_new;
 
 
 /* the model of the GtkTreeView */
@@ -83,7 +82,7 @@ GtkStatusIcon *tray_icon;
 /* XML for the preferences gui */
 /* It's here because we must load it from main_window.c to put */
 /* the options of the column list from Gconf on load */
-GladeXML *xml_pref;
+GtkBuilder *builder_pref;
 
 /* List of introduced path in save in dialogs */
 GList *save_in_paths;
diff --git a/src/main_window_cb.c b/src/main_window_cb.c
index bfa71cd..a633041 100644
--- a/src/main_window_cb.c
+++ b/src/main_window_cb.c
@@ -16,7 +16,6 @@
  
 #include <config.h>
 #include <gnome.h>
-#include <glade/glade.h>
 #include <gconf/gconf-client.h>
 #include <signal.h>
 
@@ -57,7 +56,7 @@ on_treeview1_button_press_event(GtkWidget *widget, GdkEventButton *event,gpointe
 	GError *err = NULL;
 	GFile *location; 
 	
-	treev=glade_xml_get_widget(xml,"treeview1");
+	treev=GTK_WIDGET (gtk_builder_get_object(builder,"treeview1"));
 	select=gtk_tree_view_get_selection(GTK_TREE_VIEW(treev));
 
 	/* Right click - Show popup menu */
@@ -79,7 +78,7 @@ on_treeview1_button_press_event(GtkWidget *widget, GdkEventButton *event,gpointe
 				gtk_tree_path_free(path);
 			}
 
-			popup=glade_xml_get_widget(xml,"popup1");
+			popup=GTK_WIDGET (gtk_builder_get_object(builder,"popup1"));
 			gtk_menu_popup (GTK_MENU(popup), NULL, NULL, NULL, NULL, 
 							event_button->button, event_button->time);
 			gwget_data_set_popupmenu (gwget_data_get_selected());
@@ -138,7 +137,7 @@ stop_all_downloads(void)
 		gtk_tree_model_iter_next(model,&iter);
 	}
 
-	gtk_window_set_title(GTK_WINDOW(glade_xml_get_widget(xml, "main_window")), _("Gwget - Download Manager"));
+	gtk_window_set_title(GTK_WINDOW (gtk_builder_get_object(builder, "main_window")), _("Gwget - Download Manager"));
 }
 
 void
@@ -236,7 +235,7 @@ new_download(GwgetData* gwgetdata)
 		
 	gwgetdata->file_list=iter; 
 
-        select=gtk_tree_view_get_selection(GTK_TREE_VIEW(glade_xml_get_widget(xml,"treeview1")));
+        select=gtk_tree_view_get_selection(GTK_TREE_VIEW(GTK_WIDGET (gtk_builder_get_object(builder,"treeview1"))));
 	gtk_tree_selection_select_iter(select, &iter);
 	
 	g_object_set_data(G_OBJECT(model),gwgetdata->url,gwgetdata);
@@ -273,18 +272,24 @@ new_download(GwgetData* gwgetdata)
 void 
 on_boton_pref_clicked(GtkWidget *widget, gpointer data)
 {
-	gchar *xml_file = NULL;
+	gchar *builder_file = NULL;
 	GtkWidget *window = NULL,*entry=NULL, *checkbutton=NULL, *main_window = NULL;
+	GError* error = NULL;
 	
-	if (!xml_pref) {
-		xml_file=g_build_filename(DATADIR,"preferences.glade",NULL);
-		xml_pref = glade_xml_new(xml_file,NULL,NULL);
-		glade_xml_signal_autoconnect(xml_pref);
+	if (!builder_pref) {
+		builder_file=g_build_filename(DATADIR,"preferences.ui",NULL);
+		builder_pref = gtk_builder_new();
+		if (!gtk_builder_add_from_file (builder_pref, builder_file, &error))
+			{
+				g_warning ("Couldn't load builder file: s");
+				g_error_free (error);
+			}
+		gtk_builder_connect_signals(builder_pref, NULL);
 	}
 		
-	main_window = glade_xml_get_widget (xml, "main_window");
-	window = glade_xml_get_widget (xml_pref, "pref_window");
-	entry = glade_xml_get_widget(xml_pref,"save_in_entry");
+	main_window = GTK_WIDGET (gtk_builder_get_object (builder, "main_window"));
+	window = GTK_WIDGET (gtk_builder_get_object (builder_pref, "pref_window"));
+	entry = GTK_WIDGET (gtk_builder_get_object(builder_pref,"save_in_entry"));
 
 	gtk_window_set_transient_for(GTK_WINDOW(window), GTK_WINDOW(main_window));
 
@@ -298,77 +303,77 @@ on_boton_pref_clicked(GtkWidget *widget, gpointer data)
 
 	if (gwget_pref.network_mode!=NULL) {
 		if ( strcmp (gwget_pref.network_mode, "manual") == 0) {
-			checkbutton=glade_xml_get_widget(GLADE_XML(xml_pref),"manual_radio");
+			checkbutton=GTK_WIDGET (gtk_builder_get_object(builder_pref,"manual_radio"));
 			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton),TRUE);
 		} else if ( strcmp (gwget_pref.network_mode, "default") == 0 ) {
-			checkbutton=glade_xml_get_widget(GLADE_XML(xml_pref),"default_radio");
+			checkbutton=GTK_WIDGET (gtk_builder_get_object(builder_pref,"default_radio"));
 			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton),TRUE);
 		} else {
-			checkbutton=glade_xml_get_widget(GLADE_XML(xml_pref),"direct_radio");
+			checkbutton=GTK_WIDGET (gtk_builder_get_object(builder_pref,"direct_radio"));
 			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton),TRUE);
 		}
 	} else {
-			checkbutton=glade_xml_get_widget(GLADE_XML(xml_pref),"direct_radio");
+			checkbutton=GTK_WIDGET (gtk_builder_get_object(builder_pref,"direct_radio"));
 			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton),TRUE);
 	}
 	
 
 	if (gwget_pref.http_proxy!=NULL) {
-		entry = glade_xml_get_widget(xml_pref,"http_proxy_entry");
+		entry = GTK_WIDGET (gtk_builder_get_object(builder_pref,"http_proxy_entry"));
 		gtk_entry_set_text(GTK_ENTRY(entry),gwget_pref.http_proxy);
-		checkbutton=glade_xml_get_widget(GLADE_XML(xml_pref),"proxy_uses_auth_radio");
+		checkbutton=GTK_WIDGET (gtk_builder_get_object(builder_pref,"proxy_uses_auth_radio"));
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton),gwget_pref.proxy_uses_auth);
-		entry = glade_xml_get_widget(xml_pref,"proxy_user");
+		entry = GTK_WIDGET (gtk_builder_get_object(builder_pref,"proxy_user"));
 		gtk_entry_set_text(GTK_ENTRY(entry),gwget_pref.proxy_user);
-		entry = glade_xml_get_widget(xml_pref,"proxy_password");
+		entry = GTK_WIDGET (gtk_builder_get_object(builder_pref,"proxy_password"));
 		gtk_entry_set_text(GTK_ENTRY(entry),gwget_pref.proxy_password);
 
 	}
 	
-	checkbutton=glade_xml_get_widget(GLADE_XML(xml_pref),"http_proxy_port_spin");
+	checkbutton=GTK_WIDGET (gtk_builder_get_object(builder_pref,"http_proxy_port_spin"));
 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(checkbutton), (gdouble)gwget_pref.http_proxy_port);
 
 	
 	/* General */
-	checkbutton = glade_xml_get_widget (GLADE_XML(xml_pref), "ask_save_each_dl_check");
+	checkbutton = GTK_WIDGET (gtk_builder_get_object (builder_pref, "ask_save_each_dl_check"));
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), gwget_pref.ask_save_each_dl);
 
 	
-	checkbutton = glade_xml_get_widget(GLADE_XML(xml_pref),"num_retries_spin");
+	checkbutton = GTK_WIDGET (gtk_builder_get_object(builder_pref,"num_retries_spin"));
 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(checkbutton), (gdouble)gwget_pref.num_retries);
 
-	checkbutton=glade_xml_get_widget(GLADE_XML(xml_pref), "resume_at_start");
+	checkbutton=GTK_WIDGET (gtk_builder_get_object(builder_pref, "resume_at_start"));
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton),gwget_pref.resume_at_start);
 
-	checkbutton=glade_xml_get_widget(GLADE_XML(xml_pref), "open_after_dl");
+	checkbutton=GTK_WIDGET (gtk_builder_get_object(builder_pref, "open_after_dl"));
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton),gwget_pref.open_after_dl);
 	
 	/* Recursive */
-	checkbutton=glade_xml_get_widget(GLADE_XML(xml_pref),"no_create_directories");
+	checkbutton=GTK_WIDGET (gtk_builder_get_object(builder_pref,"no_create_directories"));
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton),gwget_pref.no_create_directories);
 
-	checkbutton=glade_xml_get_widget(GLADE_XML(xml_pref),"follow_relative");
+	checkbutton=GTK_WIDGET (gtk_builder_get_object(builder_pref,"follow_relative"));
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton),gwget_pref.follow_relative);
 
-	checkbutton=glade_xml_get_widget(GLADE_XML(xml_pref),"convert_links");
+	checkbutton=GTK_WIDGET (gtk_builder_get_object(builder_pref,"convert_links"));
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton),gwget_pref.convert_links);
 
-	checkbutton=glade_xml_get_widget(GLADE_XML(xml_pref),"dl_page_requisites");
+	checkbutton=GTK_WIDGET (gtk_builder_get_object(builder_pref,"dl_page_requisites"));
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton),gwget_pref.dl_page_requisites);
 
-	checkbutton=glade_xml_get_widget(GLADE_XML(xml_pref),"max_depth");
+	checkbutton=GTK_WIDGET (gtk_builder_get_object(builder_pref,"max_depth"));
 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(checkbutton), (gdouble)gwget_pref.max_depth);
 
-	checkbutton=glade_xml_get_widget(GLADE_XML(xml_pref),"limit_speed_check");
+	checkbutton=GTK_WIDGET (gtk_builder_get_object(builder_pref,"limit_speed_check"));
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton),gwget_pref.limit_speed);
 
-	checkbutton=glade_xml_get_widget(GLADE_XML(xml_pref),"limit_speed_spin");
+	checkbutton=GTK_WIDGET (gtk_builder_get_object(builder_pref,"limit_speed_spin"));
 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(checkbutton), (gdouble)gwget_pref.max_speed);
 
-	checkbutton=glade_xml_get_widget(GLADE_XML(xml_pref),"limit_simultaneousdownloads_check");
+	checkbutton=GTK_WIDGET (gtk_builder_get_object(builder_pref,"limit_simultaneousdownloads_check"));
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton),gwget_pref.limit_simultaneousdownloads);
 
-	checkbutton=glade_xml_get_widget(GLADE_XML(xml_pref),"limit_simultaneousdownloads_spin");
+	checkbutton=GTK_WIDGET (gtk_builder_get_object(builder_pref,"limit_simultaneousdownloads_spin"));
 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(checkbutton), (gdouble)gwget_pref.max_simultaneousdownloads);
 
 	gtk_widget_show(window);
@@ -382,7 +387,7 @@ on_pref_cancel_button_clicked(GtkWidget *widget,gpointer data)
 {
 	GtkWidget *pref_window = NULL;
 	
-	pref_window = glade_xml_get_widget(xml_pref,"pref_window");
+	pref_window = GTK_WIDGET (gtk_builder_get_object(builder_pref,"pref_window"));
 	gtk_widget_hide(pref_window);
 }
 
@@ -399,74 +404,74 @@ on_pref_ok_button_clicked(GtkWidget *widget,gpointer data)
 	GtkWidget *manual_radio=NULL, *direct_radio=NULL, *default_radio=NULL, *proxy_uses_auth_radio=NULL;
 	GtkWidget *limit_simultaneousdownloads_check=NULL, *limit_simultaneousdownloads_spin=NULL;
 
-	save_in=glade_xml_get_widget(xml_pref,"save_in_entry");
+	save_in=GTK_WIDGET (gtk_builder_get_object(builder_pref,"save_in_entry"));
 	gwget_pref.download_dir=g_strdup(gtk_entry_get_text(GTK_ENTRY(save_in)));
 	
 	/* Set HTTP proxy values */
 	
-	http_proxy=glade_xml_get_widget(xml_pref,"http_proxy_entry");
+	http_proxy=GTK_WIDGET (gtk_builder_get_object(builder_pref,"http_proxy_entry"));
 	gwget_pref.http_proxy=g_strdup(gtk_entry_get_text(GTK_ENTRY(http_proxy)));
 	gconf_client_set_string(gconf_client,"/apps/gwget2/http_proxy",
 							g_strdup(gtk_entry_get_text(GTK_ENTRY(http_proxy))),NULL);
 	
-	proxy_user=glade_xml_get_widget(xml_pref,"proxy_user");
+	proxy_user=GTK_WIDGET (gtk_builder_get_object(builder_pref,"proxy_user"));
 	gwget_pref.proxy_user=g_strdup(gtk_entry_get_text(GTK_ENTRY(proxy_user)));
 	gconf_client_set_string(gconf_client,"/apps/gwget2/proxy_user",
 							g_strdup(gtk_entry_get_text(GTK_ENTRY(proxy_user))),NULL);
 							
-	proxy_password=glade_xml_get_widget(xml_pref,"proxy_password");
+	proxy_password=GTK_WIDGET (gtk_builder_get_object(builder_pref,"proxy_password"));
 	gwget_pref.proxy_password=g_strdup(gtk_entry_get_text(GTK_ENTRY(proxy_password)));
 	gconf_client_set_string(gconf_client,"/apps/gwget2/proxy_password",
 							g_strdup(gtk_entry_get_text(GTK_ENTRY(proxy_password))),NULL);
 	
-	http_proxy_port_spin = glade_xml_get_widget (GLADE_XML(xml_pref), "http_proxy_port_spin");
+	http_proxy_port_spin = GTK_WIDGET (gtk_builder_get_object (builder_pref, "http_proxy_port_spin"));
 	gwget_pref.http_proxy_port = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(http_proxy_port_spin));
 	gconf_client_set_int(gconf_client,"/apps/gwget2/http_proxy_port",
 						  gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(http_proxy_port_spin)),NULL);
 						  
-	proxy_uses_auth_radio=glade_xml_get_widget(xml_pref,"proxy_uses_auth_radio");
+	proxy_uses_auth_radio=GTK_WIDGET (gtk_builder_get_object(builder_pref,"proxy_uses_auth_radio"));
 
 	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (proxy_uses_auth_radio))) {
 		gconf_client_set_bool(gconf_client,"/apps/gwget2/network_mode",TRUE,NULL);
 		gwget_pref.proxy_uses_auth=TRUE;
 	}
 	
-	manual_radio=glade_xml_get_widget(xml_pref,"manual_radio");
+	manual_radio=GTK_WIDGET (gtk_builder_get_object(builder_pref,"manual_radio"));
 	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(manual_radio))) {
 		gconf_client_set_string(gconf_client,"/apps/gwget2/network_mode","manual",NULL);
 		gwget_pref.network_mode="manual";
 	}
 			
-	direct_radio=glade_xml_get_widget(xml_pref,"direct_radio");
+	direct_radio=GTK_WIDGET (gtk_builder_get_object(builder_pref,"direct_radio"));
 	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(direct_radio))) {
 		gconf_client_set_string(gconf_client,"/apps/gwget2/network_mode","direct",NULL);
 		gwget_pref.network_mode="direct";
 	}	
 	
-	default_radio=glade_xml_get_widget(xml_pref,"default_radio");
+	default_radio=GTK_WIDGET (gtk_builder_get_object(builder_pref,"default_radio"));
 	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(default_radio))) {
 		gconf_client_set_string(gconf_client,"/apps/gwget2/network_mode","default",NULL);
 		gwget_pref.network_mode="default";
 	}	
 		
-	ask_each_dl = glade_xml_get_widget(xml_pref, "ask_save_each_dl_check");
+	ask_each_dl = GTK_WIDGET (gtk_builder_get_object(builder_pref, "ask_save_each_dl_check"));
 	gwget_pref.ask_save_each_dl = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ask_each_dl));
 	gconf_client_set_bool(gconf_client, "/apps/gwget2/ask_save_each_dl",
 				gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ask_each_dl)), NULL);
 	
 	
-	num_retries = glade_xml_get_widget(xml_pref,"num_retries_spin");
+	num_retries = GTK_WIDGET (gtk_builder_get_object(builder_pref,"num_retries_spin"));
 	gwget_pref.num_retries = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(num_retries));
 	
-	resume=glade_xml_get_widget(xml_pref,"resume_at_start");
+	resume=GTK_WIDGET (gtk_builder_get_object(builder_pref,"resume_at_start"));
 	gwget_pref.resume_at_start=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resume));
 
-	open_after_dl = glade_xml_get_widget(xml_pref, "open_after_dl");
+	open_after_dl = GTK_WIDGET (gtk_builder_get_object(builder_pref, "open_after_dl"));
 	gwget_pref.open_after_dl = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(open_after_dl));
 	gconf_client_set_bool(gconf_client, "/apps/gwget2/open_after_dl",
 					gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(open_after_dl)), NULL);
 	
-	pref_window = glade_xml_get_widget(xml_pref,"pref_window");
+	pref_window = GTK_WIDGET (gtk_builder_get_object(builder_pref,"pref_window"));
 	gtk_widget_hide(pref_window);
 	
 	gconf_client_set_string(gconf_client,"/apps/gwget2/download_dir",
@@ -477,8 +482,8 @@ on_pref_ok_button_clicked(GtkWidget *widget,gpointer data)
 						  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resume)),NULL);
 	
 	/* Limit Speed */
-	limit_speed_check = glade_xml_get_widget (GLADE_XML(xml_pref), "limit_speed_check");
-	limit_speed_spin = glade_xml_get_widget (GLADE_XML(xml_pref), "limit_speed_spin");
+	limit_speed_check = GTK_WIDGET (gtk_builder_get_object (builder_pref, "limit_speed_check"));
+	limit_speed_spin = GTK_WIDGET (gtk_builder_get_object (builder_pref, "limit_speed_spin"));
 
 	if ( (count_download_in_progress()>0) && 
 	    ((gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(limit_speed_check)) &&
@@ -496,64 +501,64 @@ on_pref_ok_button_clicked(GtkWidget *widget,gpointer data)
 						  gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(limit_speed_spin)),NULL);
 	
 	/* Limit Simultaneous downloads */
-	limit_simultaneousdownloads_check = glade_xml_get_widget (GLADE_XML(xml_pref), "limit_simultaneousdownloads_check");
+	limit_simultaneousdownloads_check = GTK_WIDGET (gtk_builder_get_object (builder_pref, "limit_simultaneousdownloads_check"));
 	gwget_pref.limit_simultaneousdownloads = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(limit_simultaneousdownloads_check));
 	gconf_client_set_bool(gconf_client,"/apps/gwget2/limit_simultaneousdownloads",
 						  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(limit_simultaneousdownloads_check)),NULL);
-	limit_simultaneousdownloads_spin = glade_xml_get_widget (GLADE_XML(xml_pref), "limit_simultaneousdownloads_spin");
+	limit_simultaneousdownloads_spin = GTK_WIDGET (gtk_builder_get_object (builder_pref, "limit_simultaneousdownloads_spin"));
 	gwget_pref.max_simultaneousdownloads = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(limit_simultaneousdownloads_spin));
 	gconf_client_set_int(gconf_client,"/apps/gwget2/max_simultaneousdownloads",
 						  gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(limit_simultaneousdownloads_spin)),NULL);
 	
 	/* Recursivity */
-	no_create_directories  = glade_xml_get_widget(GLADE_XML(xml_pref),"no_create_directories");
+	no_create_directories  = GTK_WIDGET (gtk_builder_get_object(builder_pref,"no_create_directories"));
 	gwget_pref.no_create_directories = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(no_create_directories));
 	gconf_client_set_bool(gconf_client,"/apps/gwget2/no_create_directories",
 						  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(no_create_directories)),NULL);
 	
 	/* Follow relative links only */
-	follow_relative = glade_xml_get_widget(GLADE_XML(xml_pref),"follow_relative");
+	follow_relative = GTK_WIDGET (gtk_builder_get_object(builder_pref,"follow_relative"));
 	gwget_pref.follow_relative = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(follow_relative));
 	gconf_client_set_bool(gconf_client,"/apps/gwget2/follow_relative",gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(follow_relative)), NULL);
 	
 	/* Convert links */
-	convert_links = glade_xml_get_widget(GLADE_XML(xml_pref),"convert_links");
+	convert_links = GTK_WIDGET (gtk_builder_get_object(builder_pref,"convert_links"));
 	gwget_pref.follow_relative = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(convert_links));
 	gconf_client_set_bool(gconf_client,"/apps/gwget2/convert_links",gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(convert_links)), NULL);
 	/* Download page requisites */
-	dl_page_requisites= glade_xml_get_widget(GLADE_XML(xml_pref),"dl_page_requisites");
+	dl_page_requisites= GTK_WIDGET (gtk_builder_get_object(builder_pref,"dl_page_requisites"));
 	gwget_pref.follow_relative = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dl_page_requisites));
 	gconf_client_set_bool(gconf_client,"/apps/gwget2/dl_page_requisites",	gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dl_page_requisites)), NULL);
 	/* Max Depth */
-	max_depth=glade_xml_get_widget(GLADE_XML(xml_pref),"max_depth");
+	max_depth=GTK_WIDGET (gtk_builder_get_object(builder_pref,"max_depth"));
 	gwget_pref.max_depth=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(max_depth));
 	gconf_client_set_int(gconf_client,"/apps/gwget2/max_depth",gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(max_depth)), NULL);
 	
 	/* Column listing */
-	gwget_pref.view_actual_size=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(GLADE_XML(xml_pref),"check_actual_size")));
+	gwget_pref.view_actual_size=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(GTK_WIDGET (gtk_builder_get_object(builder_pref,"check_actual_size"))));
 	gconf_client_set_bool(gconf_client,"/apps/gwget2/view_actual_size",
-	 					  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(GLADE_XML(xml_pref),"check_actual_size"))),NULL);
+	 					  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(GTK_WIDGET (gtk_builder_get_object(builder_pref,"check_actual_size")))),NULL);
 
-	gwget_pref.view_total_size=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(GLADE_XML(xml_pref),"check_total_size")));
+	gwget_pref.view_total_size=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(GTK_WIDGET (gtk_builder_get_object(builder_pref,"check_total_size"))));
 	gconf_client_set_bool(gconf_client,"/apps/gwget2/view_total_size",
-						  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(GLADE_XML(xml_pref),"check_total_size"))),NULL);
+						  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(GTK_WIDGET (gtk_builder_get_object(builder_pref,"check_total_size")))),NULL);
 	
-	gwget_pref.view_percentage=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(GLADE_XML(xml_pref),"check_percentage")));
+	gwget_pref.view_percentage=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(GTK_WIDGET (gtk_builder_get_object(builder_pref,"check_percentage"))));
 	gconf_client_set_bool(gconf_client,"/apps/gwget2/view_percentage",
-						  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(GLADE_XML(xml_pref),"check_percentage"))),NULL);
+						  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(GTK_WIDGET (gtk_builder_get_object(builder_pref,"check_percentage")))),NULL);
 
 
-	gwget_pref.view_elapse_time=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(GLADE_XML(xml_pref),"check_elapse_time")));
+	gwget_pref.view_elapse_time=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(GTK_WIDGET (gtk_builder_get_object(builder_pref,"check_elapse_time"))));
 	gconf_client_set_bool(gconf_client,"/apps/gwget2/view_elapse_time",
-						  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(GLADE_XML(xml_pref),"check_elapse_time"))),NULL);
+						  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(GTK_WIDGET (gtk_builder_get_object(builder_pref,"check_elapse_time")))),NULL);
 
-	gwget_pref.view_rem_time=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(GLADE_XML(xml_pref),"check_rem_time")));
+	gwget_pref.view_rem_time=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(GTK_WIDGET (gtk_builder_get_object(builder_pref,"check_rem_time"))));
 	gconf_client_set_bool(gconf_client,"/apps/gwget2/view_rem_time",
-						  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(GLADE_XML(xml_pref),"check_rem_time"))),NULL);
+						  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(GTK_WIDGET (gtk_builder_get_object(builder_pref,"check_rem_time")))),NULL);
 
-	gwget_pref.view_down_speed=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(GLADE_XML(xml_pref),"check_down_speed")));
+	gwget_pref.view_down_speed=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(GTK_WIDGET (gtk_builder_get_object(builder_pref,"check_down_speed"))));
 	gconf_client_set_bool(gconf_client,"/apps/gwget2/view_down_speed",
-						  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(GLADE_XML(xml_pref),"check_down_speed"))),NULL);
+						  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(GTK_WIDGET (gtk_builder_get_object(builder_pref,"check_down_speed")))),NULL);
 
 }
 
@@ -562,7 +567,7 @@ on_browse_save_in_button_clicked(GtkWidget *widget, gpointer data)
 {
 	GtkWidget *filesel = NULL;
 	GtkWidget *save_in;
-	save_in = glade_xml_get_widget(xml_pref,"save_in_entry");
+	save_in = GTK_WIDGET (gtk_builder_get_object(builder_pref,"save_in_entry"));
 	
 	filesel = gtk_file_chooser_dialog_new  (_("Select Folder"),
 						NULL,
@@ -628,7 +633,7 @@ on_cancel_download_activate(GtkWidget *widget,gpointer data)
     			gwgetdata->total_time = 0;
     			gwget_data_set_state (gwgetdata, DL_COMPLETED);
 			if (gwgetdata == gwget_data_get_selected()) {
-				gtk_window_set_title(GTK_WINDOW(glade_xml_get_widget(xml, "main_window")), _("Gwget - Download Manager"));
+				gtk_window_set_title(GTK_WINDOW(GTK_WIDGET (gtk_builder_get_object(builder, "main_window"))), _("Gwget - Download Manager"));
 			}
 			gtk_list_store_remove(GTK_LIST_STORE(model),&gwgetdata->file_list);
 			downloads=g_list_remove(downloads,gwgetdata);
@@ -666,8 +671,8 @@ on_remove_completed_activate(GtkWidget *widget, gpointer data)
 					gtk_tree_model_iter_next(model,&iter);
 				}
 			}
-			gtk_widget_set_sensitive(glade_xml_get_widget(xml, "clear_button"), FALSE);
-			gtk_window_set_title(GTK_WINDOW(glade_xml_get_widget(xml, "main_window")), _("Gwget - Download Manager"));
+			gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder, "clear_button")), FALSE);
+			gtk_window_set_title(GTK_WINDOW(GTK_WIDGET (gtk_builder_get_object(builder, "main_window"))), _("Gwget - Download Manager"));
 		}
 	}
 				
@@ -735,7 +740,7 @@ on_remove_all_activate(GtkWidget *widget, gpointer data)
 				gtk_list_store_remove(GTK_LIST_STORE(model),&iter);
 				downloads=g_list_remove(downloads,gwgetdata);
 			}
-			gtk_window_set_title(GTK_WINDOW(glade_xml_get_widget(xml, "main_window")), _("Gwget - Download Manager"));
+			gtk_window_set_title(GTK_WINDOW(GTK_WIDGET (gtk_builder_get_object(builder, "main_window"))), _("Gwget - Download Manager"));
 		}
 	}
 
@@ -747,8 +752,8 @@ on_view_toolbar_activate(GtkWidget *widget,gpointer data)
 	GtkWidget *toolbar,*menu_item;
 	gboolean state;
 	
-	toolbar=glade_xml_get_widget(GLADE_XML(xml),"toolbar1");
-	menu_item=glade_xml_get_widget(GLADE_XML(xml),"view_toolbar");
+	toolbar=GTK_WIDGET (gtk_builder_get_object(builder,"toolbar1"));
+	menu_item=GTK_WIDGET (gtk_builder_get_object(builder,"view_toolbar"));
 	state = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menu_item));
 	
 	if (!state) 
@@ -766,8 +771,8 @@ on_view_statusbar_activate(GtkWidget *widget, gpointer data)
 	GtkWidget *statusbar, *menu_item;
 	gboolean state;
 
-	statusbar = glade_xml_get_widget (GLADE_XML(xml), "statusbar");
-	menu_item=glade_xml_get_widget(GLADE_XML(xml),"view_statusbar");
+	statusbar = GTK_WIDGET (gtk_builder_get_object (builder, "statusbar"));
+	menu_item=GTK_WIDGET (gtk_builder_get_object(builder,"view_statusbar"));
 	state = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menu_item));
 	
 	if (!state) 
@@ -788,19 +793,19 @@ on_properties_activate(GtkWidget *widget, gpointer data)
 	gwgetdata = gwget_data_get_selected();	
 	
 	if (gwgetdata) {
-		main_window=glade_xml_get_widget(GLADE_XML(xml),"main_window");
-		properties=glade_xml_get_widget(GLADE_XML(xml),"properties_window");
+		main_window=GTK_WIDGET (gtk_builder_get_object(builder,"main_window"));
+		properties=GTK_WIDGET (gtk_builder_get_object(builder,"properties_window"));
 		gtk_window_set_transient_for(GTK_WINDOW(properties),GTK_WINDOW(main_window));
-		url_txt=glade_xml_get_widget(GLADE_XML(xml),"url_text");
+		url_txt=GTK_WIDGET (gtk_builder_get_object(builder,"url_text"));
 		gtk_label_set_text(GTK_LABEL(url_txt),gwgetdata->url);
-		local_file=glade_xml_get_widget(GLADE_XML(xml),"local_file_text");
+		local_file=GTK_WIDGET (gtk_builder_get_object(builder,"local_file_text"));
 		gtk_label_set_text(GTK_LABEL(local_file),gwgetdata->filename);
-		local_dir=glade_xml_get_widget(GLADE_XML(xml),"local_dir");
+		local_dir=GTK_WIDGET (gtk_builder_get_object(builder,"local_dir"));
 		gtk_label_set_text(GTK_LABEL(local_dir),gwgetdata->dir);
 		if (gwgetdata->state==DL_COMPLETED) {
-                   gtk_widget_set_sensitive(glade_xml_get_widget(xml, "compare_md5"), TRUE);
+                   gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder, "compare_md5")), TRUE);
 		} else {
-                   gtk_widget_set_sensitive(glade_xml_get_widget(xml, "compare_md5"), FALSE);
+                   gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder, "compare_md5")), FALSE);
                 }
                 gtk_widget_show(properties);
 	}
@@ -814,7 +819,7 @@ on_compare_md5_clicked(GtkWidget *widget, gpointer data)
    gwgetdata=gwget_data_get_selected();
 	
    if (gwgetdata) {
-      gtk_widget_show(glade_xml_get_widget(GLADE_XML(xml),"md5_window"));
+      gtk_widget_show(GTK_WIDGET (gtk_builder_get_object(builder,"md5_window")));
    }
 }
 
@@ -842,7 +847,7 @@ on_md5ok_button_clicked(GtkWidget *widget, gpointer data)
    gwgetdata = gwget_data_get_selected();
 	
    if (gwgetdata) {
-      md5=glade_xml_get_widget(GLADE_XML(xml),"md5_window");
+      md5 = GTK_WIDGET (gtk_builder_get_object(builder,"md5_window"));
       
       file = g_file_new_for_path (gwgetdata->local_filename);
       
@@ -856,7 +861,7 @@ on_md5ok_button_clicked(GtkWidget *widget, gpointer data)
 				sizeread = (gssize *)g_input_stream_read (stream, dataread, MD5BUFSIZE, NULL,NULL);
       }
 
-      entrytext=gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(GLADE_XML(xml),"md5_entry")));
+      entrytext = gtk_entry_get_text(GTK_ENTRY (gtk_builder_get_object(builder, "md5_entry")));
 
       md5_finish_ctx(&md5context, md5digest);
 
@@ -905,7 +910,7 @@ on_check_actual_size_toggled(GtkWidget *widget, gpointer data)
 	GtkWidget *treev,*column;
 	gboolean visible;
 	
-	treev = glade_xml_get_widget(xml,"treeview1");
+	treev = GTK_WIDGET (gtk_builder_get_object(builder,"treeview1"));
 	column=(GtkWidget *)gtk_tree_view_get_column(GTK_TREE_VIEW(treev),CURRENTSIZE_COLUMN-2);
 	visible=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
 	gtk_tree_view_column_set_visible(GTK_TREE_VIEW_COLUMN(column),
@@ -918,7 +923,7 @@ on_check_total_size_toggled(GtkWidget *widget, gpointer data)
 	GtkWidget *treev,*column;
 	gboolean visible;
 	
-	treev = glade_xml_get_widget(xml,"treeview1");
+	treev = GTK_WIDGET (gtk_builder_get_object(builder, "treeview1"));
 	column=(GtkWidget *)gtk_tree_view_get_column(GTK_TREE_VIEW(treev),TOTALSIZE_COLUMN-2);
 	visible=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
 	gtk_tree_view_column_set_visible(GTK_TREE_VIEW_COLUMN(column),
@@ -932,7 +937,7 @@ on_check_percentage_toggled(GtkWidget *widget, gpointer data)
 	GtkWidget *treev,*column;
 	gboolean visible;
 	
-	treev = glade_xml_get_widget(xml,"treeview1");
+	treev = GTK_WIDGET (gtk_builder_get_object(builder,"treeview1"));
 	column=(GtkWidget *)gtk_tree_view_get_column(GTK_TREE_VIEW(treev),PERCENTAGE_COLUMN-2);
 	visible=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
 	gtk_tree_view_column_set_visible(GTK_TREE_VIEW_COLUMN(column),
@@ -946,7 +951,7 @@ on_check_elapse_time_toggled(GtkWidget *widget, gpointer data)
 	GtkWidget *treev,*column;
 	gboolean visible;
 	
-	treev = glade_xml_get_widget(xml,"treeview1");
+	treev = GTK_WIDGET (gtk_builder_get_object(builder,"treeview1"));
 	column=(GtkWidget *)gtk_tree_view_get_column(GTK_TREE_VIEW(treev),ELAPSETIME_COLUMN-3);
 	visible=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
 	gtk_tree_view_column_set_visible(GTK_TREE_VIEW_COLUMN(column),
@@ -960,7 +965,7 @@ on_check_rem_time_toggled(GtkWidget *widget, gpointer data)
 	GtkWidget *treev,*column;
 	gboolean visible;
 	
-	treev = glade_xml_get_widget(xml,"treeview1");
+	treev = GTK_WIDGET (gtk_builder_get_object(builder,"treeview1"));
 	column=(GtkWidget *)gtk_tree_view_get_column(GTK_TREE_VIEW(treev),REMAINTIME_COLUMN-5);
 	visible=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
 	gtk_tree_view_column_set_visible(GTK_TREE_VIEW_COLUMN(column),
@@ -974,7 +979,7 @@ on_check_down_speed_toggled(GtkWidget *widget, gpointer data)
 	GtkWidget *treev,*column;
 	gboolean visible;
 	
-	treev = glade_xml_get_widget(xml,"treeview1");
+	treev = GTK_WIDGET (gtk_builder_get_object(builder,"treeview1"));
 	column=(GtkWidget *)gtk_tree_view_get_column(GTK_TREE_VIEW(treev),SPEED_COLUMN-7);
 	visible=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
 	gtk_tree_view_column_set_visible(GTK_TREE_VIEW_COLUMN(column),
@@ -988,7 +993,7 @@ on_limit_speed_check_toggled (GtkWidget *widget, gpointer data)
 	GtkWidget *limit_speed_spin;
 	gboolean limit_speed;
 	
-	limit_speed_spin = glade_xml_get_widget (xml_pref, "limit_speed_spin");
+	limit_speed_spin = GTK_WIDGET (gtk_builder_get_object (builder_pref, "limit_speed_spin"));
 	limit_speed = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(widget));
 	
 	if (limit_speed) {
@@ -1004,7 +1009,7 @@ on_limit_simultaneousdownloads_check_toggled (GtkWidget *widget, gpointer data)
 	GtkWidget *limit_simultaneousdownloads_spin;
 	gboolean limit_simultaneousdownloads;
 	
-	limit_simultaneousdownloads_spin = glade_xml_get_widget (xml_pref, "limit_simultaneousdownloads_spin");
+	limit_simultaneousdownloads_spin = GTK_WIDGET (gtk_builder_get_object (builder_pref, "limit_simultaneousdownloads_spin"));
 	limit_simultaneousdownloads = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(widget));
 	
 	if (limit_simultaneousdownloads) {
@@ -1018,19 +1023,19 @@ on_manual_radio_toggled (GtkWidget *sender, gpointer data)
 {
 	GtkWidget *widget;
 
-	widget = glade_xml_get_widget(xml_pref,"http_proxy_entry");
+	widget = GTK_WIDGET (gtk_builder_get_object(builder_pref,"http_proxy_entry"));
 	gtk_widget_set_sensitive(GTK_WIDGET (widget), TRUE);
 
-	widget = glade_xml_get_widget(xml_pref, "http_proxy_port_spin");
+	widget = GTK_WIDGET (gtk_builder_get_object(builder_pref, "http_proxy_port_spin"));
 	gtk_widget_set_sensitive(GTK_WIDGET (widget), TRUE);
 
-	widget = glade_xml_get_widget(xml_pref, "proxy_uses_auth_radio");
+	widget = GTK_WIDGET (gtk_builder_get_object(builder_pref, "proxy_uses_auth_radio"));
 	gtk_widget_set_sensitive(GTK_WIDGET(widget), TRUE);
 	
-	widget = glade_xml_get_widget(xml_pref, "proxy_user");
+	widget = GTK_WIDGET (gtk_builder_get_object(builder_pref, "proxy_user"));
 	gtk_widget_set_sensitive(GTK_WIDGET(widget), TRUE);
 	
-	widget = glade_xml_get_widget(xml_pref, "proxy_password");
+	widget = GTK_WIDGET (gtk_builder_get_object(builder_pref, "proxy_password"));
 	gtk_widget_set_sensitive(GTK_WIDGET(widget), TRUE);
 
 }
@@ -1040,21 +1045,21 @@ on_direct_radio_toggled (GtkWidget *sender, gpointer data)
 {
 	GtkWidget *widget;
 
-	widget = glade_xml_get_widget(xml_pref,"http_proxy_entry");
+	widget = GTK_WIDGET (gtk_builder_get_object(builder_pref,"http_proxy_entry"));
 	gtk_widget_set_sensitive(GTK_WIDGET (widget), FALSE);
-	widget = glade_xml_get_widget(xml_pref, "http_proxy_port_spin");
+	widget = GTK_WIDGET (gtk_builder_get_object(builder_pref, "http_proxy_port_spin"));
 	gtk_widget_set_sensitive(GTK_WIDGET (widget), FALSE);
 
-	widget = glade_xml_get_widget(xml_pref, "http_proxy_port_spin");
+	widget = GTK_WIDGET (gtk_builder_get_object(builder_pref, "http_proxy_port_spin"));
 	gtk_widget_set_sensitive(GTK_WIDGET(widget), FALSE);
 	
-	widget = glade_xml_get_widget(xml_pref, "proxy_uses_auth_radio");
+	widget = GTK_WIDGET (gtk_builder_get_object(builder_pref, "proxy_uses_auth_radio"));
 	gtk_widget_set_sensitive(GTK_WIDGET(widget), FALSE);
 	
-	widget = glade_xml_get_widget(xml_pref, "proxy_user");
+	widget = GTK_WIDGET (gtk_builder_get_object(builder_pref, "proxy_user"));
 	gtk_widget_set_sensitive(GTK_WIDGET(widget), FALSE);
 	
-	widget = glade_xml_get_widget(xml_pref, "proxy_password");
+	widget = GTK_WIDGET (gtk_builder_get_object(builder_pref, "proxy_password"));
 	gtk_widget_set_sensitive(GTK_WIDGET(widget), FALSE);
 
 }
@@ -1064,19 +1069,19 @@ on_default_radio_toggled(GtkWidget *sender, gpointer data)
 {	
 	GtkWidget *widget;
 
-	widget = glade_xml_get_widget(xml_pref, "http_proxy_entry");
+	widget = GTK_WIDGET (gtk_builder_get_object(builder_pref, "http_proxy_entry"));
 	gtk_widget_set_sensitive(GTK_WIDGET(widget), FALSE);
 	
-	widget = glade_xml_get_widget(xml_pref, "http_proxy_port_spin");
+	widget = GTK_WIDGET (gtk_builder_get_object(builder_pref, "http_proxy_port_spin"));
 	gtk_widget_set_sensitive(GTK_WIDGET(widget), FALSE);
 	
-	widget = glade_xml_get_widget(xml_pref, "proxy_uses_auth_radio");
+	widget = GTK_WIDGET (gtk_builder_get_object(builder_pref, "proxy_uses_auth_radio"));
 	gtk_widget_set_sensitive(GTK_WIDGET(widget), TRUE);
 	
-	widget = glade_xml_get_widget(xml_pref, "proxy_user");
+	widget = GTK_WIDGET (gtk_builder_get_object(builder_pref, "proxy_user"));
 	gtk_widget_set_sensitive(GTK_WIDGET(widget), TRUE);
 	
-	widget = glade_xml_get_widget(xml_pref, "proxy_password");
+	widget = GTK_WIDGET (gtk_builder_get_object(builder_pref, "proxy_password"));
 	gtk_widget_set_sensitive(GTK_WIDGET(widget), TRUE);
 }
 
@@ -1182,9 +1187,9 @@ on_edit_menu_activate(void)
 {
 	if (count_all_downloads()>0) 
 	{
-		 gtk_widget_set_sensitive(glade_xml_get_widget(xml, "remove_item"), TRUE);
+		 gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder, "remove_item")), TRUE);
 	} else {
-		 gtk_widget_set_sensitive(glade_xml_get_widget(xml, "remove_item"), FALSE);
+		 gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder, "remove_item")), FALSE);
 	}
 }
 
@@ -1283,11 +1288,11 @@ on_file_menuitem_activate (GtkWidget *widget, gpointer data)
 
 	if (count_all_downloads()==0)
 	{
-		gtk_widget_set_sensitive(glade_xml_get_widget(xml,"pause_all_menuitem"), FALSE);
-		gtk_widget_set_sensitive(glade_xml_get_widget(xml,"resume_all_menuitem"), FALSE);
+		gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder,"pause_all_menuitem")), FALSE);
+		gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder,"resume_all_menuitem")), FALSE);
 	} else {
-		gtk_widget_set_sensitive(glade_xml_get_widget(xml,"pause_all_menuitem"), TRUE);
-		gtk_widget_set_sensitive(glade_xml_get_widget(xml,"resume_all_menuitem"), TRUE);
+		gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder,"pause_all_menuitem")), TRUE);
+		gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder,"resume_all_menuitem")), TRUE);
 	}
 
 }
diff --git a/src/new_window.c b/src/new_window.c
index 712e243..57b4b60 100644
--- a/src/new_window.c
+++ b/src/new_window.c
@@ -25,7 +25,6 @@ This file creates the window for add new download and its callback
 
 
 #include <gnome.h>
-#include <glade/glade.h>
 #include <config.h>
 #include "new_window.h"
 #include "main_window.h"
@@ -45,15 +44,15 @@ void on_ok_button_clicked(GtkWidget *widget, gpointer data)
 	gchar *save_in_list;
 	GwgetData *gwgetdata;
 		
-	window = glade_xml_get_widget(xml, "new_window");
-	combo = glade_xml_get_widget (xml, "save_in_comboboxentry");
+	window = GTK_WIDGET (gtk_builder_get_object(builder, "new_window"));
+	combo = GTK_WIDGET (gtk_builder_get_object (builder, "save_in_comboboxentry"));
 	save_in_entry=GTK_ENTRY(GTK_BIN(combo)->child);
 	
-	url=g_strstrip((gchar *)(gtk_entry_get_text (GTK_ENTRY(glade_xml_get_widget(xml, "url_entry")))));
+	url=g_strstrip((gchar *)(gtk_entry_get_text (GTK_ENTRY(GTK_WIDGET (gtk_builder_get_object(builder, "url_entry"))))));
 	
 	if (strcmp(url,"")) {
 		url = g_strdup(url);
-		save_in=g_strdup(gtk_entry_get_text (GTK_ENTRY(glade_xml_get_widget(xml, "save_in_entry"))));
+		save_in=g_strdup(gtk_entry_get_text (GTK_ENTRY(GTK_WIDGET (gtk_builder_get_object(builder, "save_in_entry")))));
 		
 		if (!strcmp(save_in,"") && gwget_pref.download_dir) {
 			save_in=g_strdup(gwget_pref.download_dir);
@@ -80,7 +79,7 @@ on_cancel_button_clicked(GtkWidget *widget,gpointer data)
 {
 	GtkWidget *window = NULL;
 	
-	window = glade_xml_get_widget (xml,"new_window");
+	window = GTK_WIDGET (gtk_builder_get_object (builder,"new_window"));
 	
 	gtk_widget_hide (window);
 }
@@ -99,10 +98,10 @@ create_new_window(void)
 	}
 		
 	
-	window = glade_xml_get_widget (xml, "new_window");
+	window = GTK_WIDGET (gtk_builder_get_object (builder, "new_window"));
 
 	/* if clipboards data is an URL, then leave url value as is, else -- empty string */
-	entry = GTK_ENTRY(glade_xml_get_widget (xml, "url_entry"));
+	entry = GTK_ENTRY(GTK_WIDGET (gtk_builder_get_object (builder, "url_entry")));
 	if ( (url!=NULL) && !check_url( "http://";, url ) && !check_url( "ftp://";, url)) {
 		g_free(url);
 		url = NULL;
@@ -132,7 +131,7 @@ on_new_browse_save_in_button_clicked(GtkWidget *widget, gpointer data)
 						GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
 						NULL);
 	
-	combo = glade_xml_get_widget (xml, "save_in_comboboxentry");
+	combo = GTK_WIDGET (gtk_builder_get_object (builder, "save_in_comboboxentry"));
 	save_in_entry=GTK_ENTRY(GTK_BIN(combo)->child);
 	
 	if (gtk_dialog_run (GTK_DIALOG (filesel)) == GTK_RESPONSE_ACCEPT) {
@@ -154,8 +153,8 @@ create_new_window_with_url (gchar *url)
 	GtkWidget *window;
 	GtkWidget *entry;
 	
-	window = glade_xml_get_widget (xml, "new_window");
-	entry = glade_xml_get_widget (xml, "url_entry");
+	window = GTK_WIDGET (gtk_builder_get_object (builder, "new_window"));
+	entry = GTK_WIDGET (gtk_builder_get_object (builder, "url_entry"));
 	gtk_entry_set_text (GTK_ENTRY(entry), url);
 	
 	gtk_list_store_clear (GTK_LIST_STORE(save_in_model));
diff --git a/src/systray.c b/src/systray.c
index ed26529..18e71cb 100644
--- a/src/systray.c
+++ b/src/systray.c
@@ -157,7 +157,7 @@ pop_main_window()
 {
 	GtkWidget *window;
 	
-	window = glade_xml_get_widget(xml,"main_window");
+	window = GTK_WIDGET (gtk_builder_get_object(builder,"main_window"));
 	if((gdk_window_get_state(GTK_WIDGET(window)->window) & 
 				 GDK_WINDOW_STATE_ICONIFIED) || 
 			         !GTK_WIDGET_VISIBLE(window)) 
diff --git a/src/utils.c b/src/utils.c
index d880d98..66990dc 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -15,7 +15,6 @@
  */
 
 #include <gnome.h>
-#include <glade/glade.h>
 #include "main_window.h"
 #include "utils.h"
 #include "gwget_data.h"
@@ -28,7 +27,7 @@ run_dialog (gchar *title, gchar *message, gchar *cancel_message, gchar *action_m
 	GtkWidget *dialog;
 	gint response;
 	
-	dialog = gtk_message_dialog_new_with_markup ( GTK_WINDOW (glade_xml_get_widget(xml, "main_window")),
+	dialog = gtk_message_dialog_new_with_markup ( GTK_WINDOW (GTK_WIDGET (gtk_builder_get_object(builder, "main_window")) ),
 			GTK_DIALOG_MODAL,
 			GTK_MESSAGE_QUESTION,
 			GTK_BUTTONS_NONE,
@@ -53,7 +52,7 @@ run_dialog_information(gchar *title, gchar *msg)
 {
 	GtkWidget *dialog;
 
-  dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (glade_xml_get_widget(xml, "main_window")),
+  dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (GTK_WIDGET(gtk_builder_get_object (builder, "main_window"))),
           GTK_DIALOG_MODAL,
           GTK_MESSAGE_INFO,
           GTK_BUTTONS_CLOSE,
@@ -71,7 +70,7 @@ run_dialog_error (gchar *title, gchar *message)
 {
     GtkWidget *dialog;
     
-    dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (glade_xml_get_widget(xml, "main_window")),
+    dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (GTK_WIDGET (gtk_builder_get_object(builder, "main_window"))),
             GTK_DIALOG_MODAL,
             GTK_MESSAGE_ERROR,
             GTK_BUTTONS_CLOSE,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]