* moved 'experimental' outside the trunk
authorDirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>
Wed, 10 May 2006 08:30:13 +0000 (08:30 +0000)
committerDirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>
Wed, 10 May 2006 08:30:13 +0000 (08:30 +0000)
pmo-trunk-r21

111 files changed:
experimental/ChangeLog [deleted file]
experimental/UI/modest.glade [deleted file]
experimental/UI/modest.gladep [deleted file]
experimental/UI/pixmaps/qgn_list_gene_attacpap.png [deleted file]
experimental/UI/pixmaps/qgn_list_gene_bold.png [deleted file]
experimental/UI/pixmaps/qgn_list_gene_contacts.png [deleted file]
experimental/UI/pixmaps/qgn_list_gene_italic.png [deleted file]
experimental/UI/pixmaps/qgn_toolb_messagin.png [deleted file]
experimental/UI/pixmaps/qgn_toolb_messagin_bullets.png [deleted file]
experimental/UI/pixmaps/qgn_toolb_messagin_delete.png [deleted file]
experimental/UI/pixmaps/qgn_toolb_messagin_fontcolor.png [deleted file]
experimental/UI/pixmaps/qgn_toolb_messagin_forward.png [deleted file]
experimental/UI/pixmaps/qgn_toolb_messagin_moveto.png [deleted file]
experimental/UI/pixmaps/qgn_toolb_messagin_new.png [deleted file]
experimental/UI/pixmaps/qgn_toolb_messagin_next.png [deleted file]
experimental/UI/pixmaps/qgn_toolb_messagin_previous.png [deleted file]
experimental/UI/pixmaps/qgn_toolb_messagin_reply.png [deleted file]
experimental/UI/pixmaps/qgn_toolb_messagin_replytoall.png [deleted file]
experimental/UI/pixmaps/qgn_toolb_messagin_saveattachment.png [deleted file]
experimental/UI/pixmaps/qgn_toolb_messagin_send.png [deleted file]
experimental/UI/pixmaps/qgn_toolb_messagin_sendreceive.png [deleted file]
experimental/accountpresets/Makefile [deleted file]
experimental/accountpresets/modest-account-presets.c [deleted file]
experimental/accountpresets/modest-account-presets.h [deleted file]
experimental/accountpresets/test-modest-account-presets.c [deleted file]
experimental/display_glade/Makefile [deleted file]
experimental/display_glade/showme.c [deleted file]
experimental/modest/AUTHORS [deleted file]
experimental/modest/COPYING [deleted file]
experimental/modest/ChangeLog [deleted file]
experimental/modest/INSTALL [deleted file]
experimental/modest/Makefile.am [deleted file]
experimental/modest/NEWS [deleted file]
experimental/modest/README [deleted file]
experimental/modest/autogen.sh [deleted file]
experimental/modest/config.guess [deleted file]
experimental/modest/config.h.in [deleted file]
experimental/modest/config.sub [deleted file]
experimental/modest/configure.ac [deleted file]
experimental/modest/docs/Makefile.am [deleted file]
experimental/modest/docs/reference/Makefile.am [deleted file]
experimental/modest/docs/reference/html/home.png [deleted file]
experimental/modest/docs/reference/html/index.html [deleted file]
experimental/modest/docs/reference/html/index.sgml [deleted file]
experimental/modest/docs/reference/html/ix01.html [deleted file]
experimental/modest/docs/reference/html/left.png [deleted file]
experimental/modest/docs/reference/html/modest-ModestConf.html [deleted file]
experimental/modest/docs/reference/html/modest-core.html [deleted file]
experimental/modest/docs/reference/html/modest.devhelp [deleted file]
experimental/modest/docs/reference/html/modest.devhelp2 [deleted file]
experimental/modest/docs/reference/html/pr01.html [deleted file]
experimental/modest/docs/reference/html/right.png [deleted file]
experimental/modest/docs/reference/html/rn01.html [deleted file]
experimental/modest/docs/reference/html/rn02.html [deleted file]
experimental/modest/docs/reference/html/style.css [deleted file]
experimental/modest/docs/reference/html/up.png [deleted file]
experimental/modest/docs/reference/modest-docs.sgml [deleted file]
experimental/modest/docs/reference/modest-overrides.txt [deleted file]
experimental/modest/docs/reference/modest-sections.txt [deleted file]
experimental/modest/docs/reference/tmpl/modest-account-keys.sgml [deleted file]
experimental/modest/docs/reference/tmpl/modest-account-mgr.sgml [deleted file]
experimental/modest/docs/reference/tmpl/modest-conf-defs.sgml [deleted file]
experimental/modest/docs/reference/tmpl/modest-conf-keys.sgml [deleted file]
experimental/modest/docs/reference/tmpl/modest-conf.sgml [deleted file]
experimental/modest/docs/reference/tmpl/modest-edit-window.sgml [deleted file]
experimental/modest/docs/reference/tmpl/modest-main-window.sgml [deleted file]
experimental/modest/docs/reference/tmpl/modest-tny-account-store.sgml [deleted file]
experimental/modest/docs/reference/tmpl/modest-tny-folder-tree-view.sgml [deleted file]
experimental/modest/docs/reference/tmpl/modest-ui.sgml [deleted file]
experimental/modest/docs/reference/tmpl/modest-unused.sgml [deleted file]
experimental/modest/docs/reference/tmpl/modest-window-mgr.sgml [deleted file]
experimental/modest/docs/reference/xml/modest-account-keys.xml [deleted file]
experimental/modest/docs/reference/xml/modest-account-mgr.xml [deleted file]
experimental/modest/docs/reference/xml/modest-conf-defs.xml [deleted file]
experimental/modest/docs/reference/xml/modest-conf-keys.xml [deleted file]
experimental/modest/docs/reference/xml/modest-conf.xml [deleted file]
experimental/modest/docs/reference/xml/modest-edit-window.xml [deleted file]
experimental/modest/docs/reference/xml/modest-main-window.xml [deleted file]
experimental/modest/docs/reference/xml/modest-tny-account-store.xml [deleted file]
experimental/modest/docs/reference/xml/modest-tny-folder-tree-view.xml [deleted file]
experimental/modest/docs/reference/xml/modest-ui.xml [deleted file]
experimental/modest/docs/reference/xml/modest-window-mgr.xml [deleted file]
experimental/modest/ltmain.sh [deleted file]
experimental/modest/src/Makefile.am [deleted file]
experimental/modest/src/gtk-glade/Makefile.am [deleted file]
experimental/modest/src/gtk/Makefile.am [deleted file]
experimental/modest/src/gtk/modest-edit-window.c [deleted file]
experimental/modest/src/gtk/modest-edit-window.h [deleted file]
experimental/modest/src/gtk/modest-main-window.c [deleted file]
experimental/modest/src/gtk/modest-main-window.h [deleted file]
experimental/modest/src/gtk/modest-ui.c [deleted file]
experimental/modest/src/hildon/Makefile.am [deleted file]
experimental/modest/src/modest-account-keys.h [deleted file]
experimental/modest/src/modest-account-mgr.c [deleted file]
experimental/modest/src/modest-account-mgr.h [deleted file]
experimental/modest/src/modest-conf-gconf.c [deleted file]
experimental/modest/src/modest-conf-keys.h [deleted file]
experimental/modest/src/modest-conf.h [deleted file]
experimental/modest/src/modest-main.c [deleted file]
experimental/modest/src/modest-tny-account-store.c [deleted file]
experimental/modest/src/modest-tny-account-store.h [deleted file]
experimental/modest/src/modest-tny-folder-tree-view.c [deleted file]
experimental/modest/src/modest-tny-folder-tree-view.h [deleted file]
experimental/modest/src/modest-tny-header-tree-view.c [deleted file]
experimental/modest/src/modest-tny-header-tree-view.h [deleted file]
experimental/modest/src/modest-tny-msg-view.c [deleted file]
experimental/modest/src/modest-tny-msg-view.h [deleted file]
experimental/modest/src/modest-ui.h [deleted file]
experimental/modest/src/modest-window-mgr.c [deleted file]
experimental/modest/src/modest-window-mgr.h [deleted file]
experimental/util/tinycfg.sh [deleted file]

diff --git a/experimental/ChangeLog b/experimental/ChangeLog
deleted file mode 100644 (file)
index fddf484..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-2006-05-09  Florian Boor <fb@kernelconcepts.de>
-
-       * Add account preset object draft.
diff --git a/experimental/UI/modest.glade b/experimental/UI/modest.glade
deleted file mode 100644 (file)
index b54ab52..0000000
+++ /dev/null
@@ -1,4756 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->\r
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">\r
-\r
-<glade-interface>\r
-\r
-<widget class="GtkWindow" id="main">\r
-  <property name="visible">True</property>\r
-  <property name="title" translatable="yes">Modest</property>\r
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>\r
-  <property name="window_position">GTK_WIN_POS_NONE</property>\r
-  <property name="modal">False</property>\r
-  <property name="default_width">800</property>\r
-  <property name="default_height">600</property>\r
-  <property name="resizable">True</property>\r
-  <property name="destroy_with_parent">False</property>\r
-  <property name="icon">qgn_toolb_messagin.png</property>\r
-  <property name="decorated">True</property>\r
-  <property name="skip_taskbar_hint">False</property>\r
-  <property name="skip_pager_hint">False</property>\r
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>\r
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>\r
-  <property name="focus_on_map">True</property>\r
-  <property name="urgency_hint">False</property>\r
-\r
-  <child>\r
-    <widget class="GtkVBox" id="vbox1">\r
-      <property name="visible">True</property>\r
-      <property name="homogeneous">False</property>\r
-      <property name="spacing">0</property>\r
-\r
-      <child>\r
-       <widget class="GtkMenuBar" id="menubar1">\r
-         <property name="visible">True</property>\r
-         <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>\r
-         <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>\r
-\r
-         <child>\r
-           <widget class="GtkMenuItem" id="menuitem1">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">_Message</property>\r
-             <property name="use_underline">True</property>\r
-\r
-             <child>\r
-               <widget class="GtkMenu" id="menuitem1_menu">\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="new_e-mail1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">New e-mail</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_new_e-mail1_activate" last_modification_time="Fri, 28 Apr 2006 11:10:18 GMT"/>\r
-                     <accelerator key="N" modifiers="GDK_CONTROL_MASK" signal="activate"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="open1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Open</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_open1_activate" last_modification_time="Fri, 28 Apr 2006 11:10:18 GMT"/>\r
-                     <accelerator key="O" modifiers="GDK_CONTROL_MASK" signal="activate"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkSeparatorMenuItem" id="separator1">\r
-                     <property name="visible">True</property>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="reply1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Reply</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_reply1_activate" last_modification_time="Fri, 28 Apr 2006 11:10:18 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="reply_to_all1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Reply to all</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_reply_to_all1_activate" last_modification_time="Fri, 28 Apr 2006 11:10:18 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="forward1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Forward</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_forward1_activate" last_modification_time="Fri, 28 Apr 2006 12:05:09 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkSeparatorMenuItem" id="separator2">\r
-                     <property name="visible">True</property>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="delete1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Delete</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_delete1_activate" last_modification_time="Fri, 28 Apr 2006 12:05:09 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkSeparatorMenuItem" id="separator3">\r
-                     <property name="visible">True</property>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="details1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Details</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_details1_activate" last_modification_time="Fri, 28 Apr 2006 12:05:09 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-               </widget>\r
-             </child>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkMenuItem" id="menuitem2">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">_Edit</property>\r
-             <property name="use_underline">True</property>\r
-\r
-             <child>\r
-               <widget class="GtkMenu" id="menuitem2_menu">\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="undo1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Undo</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_undo1_activate" last_modification_time="Fri, 28 Apr 2006 11:10:18 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkSeparatorMenuItem" id="separator4">\r
-                     <property name="visible">True</property>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="cut1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Cut</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_cut1_activate" last_modification_time="Fri, 28 Apr 2006 11:10:18 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="copy1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Copy</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_copy1_activate" last_modification_time="Fri, 28 Apr 2006 11:10:18 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="paste1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Paste</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_paste1_activate" last_modification_time="Fri, 28 Apr 2006 11:10:18 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="select1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">_Select</property>\r
-                     <property name="use_underline">True</property>\r
-\r
-                     <child>\r
-                       <widget class="GtkMenu" id="select1_menu">\r
-\r
-                         <child>\r
-                           <widget class="GtkMenuItem" id="mark_all1">\r
-                             <property name="visible">True</property>\r
-                             <property name="label" translatable="yes">Mark all</property>\r
-                             <property name="use_underline">True</property>\r
-                             <signal name="activate" handler="on_mark_all1_activate" last_modification_time="Fri, 28 Apr 2006 12:10:20 GMT"/>\r
-                           </widget>\r
-                         </child>\r
-\r
-                         <child>\r
-                           <widget class="GtkMenuItem" id="unmark_all1">\r
-                             <property name="visible">True</property>\r
-                             <property name="label" translatable="yes">Unmark all</property>\r
-                             <property name="use_underline">True</property>\r
-                             <signal name="activate" handler="on_unmark_all1_activate" last_modification_time="Fri, 28 Apr 2006 12:10:20 GMT"/>\r
-                           </widget>\r
-                         </child>\r
-                       </widget>\r
-                     </child>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkSeparatorMenuItem" id="separator6">\r
-                     <property name="visible">True</property>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="move_to1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Move to...</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_move_to1_activate" last_modification_time="Fri, 28 Apr 2006 12:12:30 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-               </widget>\r
-             </child>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkMenuItem" id="menuitem3">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">_Folders</property>\r
-             <property name="use_underline">True</property>\r
-\r
-             <child>\r
-               <widget class="GtkMenu" id="menuitem3_menu">\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="new_folder1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">New folder...</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_new_folder1_activate" last_modification_time="Fri, 28 Apr 2006 12:15:47 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="manage_folders1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Manage folders</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_manage_folders1_activate" last_modification_time="Fri, 28 Apr 2006 12:15:47 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkSeparatorMenuItem" id="separator7">\r
-                     <property name="visible">True</property>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="details2">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Details</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_details2_activate" last_modification_time="Fri, 28 Apr 2006 12:15:47 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="folder_settings1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Folder settings...</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_folder_settings1_activate" last_modification_time="Fri, 28 Apr 2006 12:15:47 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkSeparatorMenuItem" id="separator8">\r
-                     <property name="visible">True</property>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkRadioMenuItem" id="inbox1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Inbox</property>\r
-                     <property name="use_underline">True</property>\r
-                     <property name="active">True</property>\r
-                     <signal name="activate" handler="on_inbox1_activate" last_modification_time="Fri, 28 Apr 2006 12:15:47 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkRadioMenuItem" id="outbox1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Outbox</property>\r
-                     <property name="use_underline">True</property>\r
-                     <property name="active">True</property>\r
-                     <property name="group">inbox1</property>\r
-                     <signal name="activate" handler="on_outbox1_activate" last_modification_time="Fri, 28 Apr 2006 12:15:47 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkRadioMenuItem" id="drafts1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Drafts</property>\r
-                     <property name="use_underline">True</property>\r
-                     <property name="active">True</property>\r
-                     <property name="group">inbox1</property>\r
-                     <signal name="activate" handler="on_drafts1_activate" last_modification_time="Fri, 28 Apr 2006 12:15:47 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkRadioMenuItem" id="sent1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Sent</property>\r
-                     <property name="use_underline">True</property>\r
-                     <property name="active">True</property>\r
-                     <property name="group">inbox1</property>\r
-                     <signal name="activate" handler="on_sent1_activate" last_modification_time="Fri, 28 Apr 2006 12:15:47 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkRadioMenuItem" id="archive1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Archive</property>\r
-                     <property name="use_underline">True</property>\r
-                     <property name="active">True</property>\r
-                     <property name="group">inbox1</property>\r
-                     <signal name="activate" handler="on_archive1_activate" last_modification_time="Fri, 28 Apr 2006 12:15:47 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-               </widget>\r
-             </child>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkMenuItem" id="menuitem4">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">_View</property>\r
-             <property name="use_underline">True</property>\r
-\r
-             <child>\r
-               <widget class="GtkMenu" id="menuitem4_menu">\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="sort1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Sort...</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_sort1_activate" last_modification_time="Fri, 28 Apr 2006 12:17:29 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkSeparatorMenuItem" id="separator9">\r
-                     <property name="visible">True</property>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="show_toolbar1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">_Show toolbar</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_show_toolbar1_activate" last_modification_time="Fri, 28 Apr 2006 12:17:29 GMT"/>\r
-\r
-                     <child>\r
-                       <widget class="GtkMenu" id="show_toolbar1_menu">\r
-\r
-                         <child>\r
-                           <widget class="GtkCheckMenuItem" id="normal_screen1">\r
-                             <property name="visible">True</property>\r
-                             <property name="label" translatable="yes">Normal screen</property>\r
-                             <property name="use_underline">True</property>\r
-                             <property name="active">True</property>\r
-                             <signal name="activate" handler="on_normal_screen1_activate" last_modification_time="Fri, 28 Apr 2006 12:17:29 GMT"/>\r
-                           </widget>\r
-                         </child>\r
-\r
-                         <child>\r
-                           <widget class="GtkCheckMenuItem" id="full_screen2">\r
-                             <property name="visible">True</property>\r
-                             <property name="label" translatable="yes">Full screen</property>\r
-                             <property name="use_underline">True</property>\r
-                             <property name="active">True</property>\r
-                             <signal name="activate" handler="on_full_screen2_activate" last_modification_time="Fri, 28 Apr 2006 12:17:29 GMT"/>\r
-                           </widget>\r
-                         </child>\r
-                       </widget>\r
-                     </child>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkCheckMenuItem" id="folders1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Folders</property>\r
-                     <property name="use_underline">True</property>\r
-                     <property name="active">True</property>\r
-                     <signal name="activate" handler="on_folders1_activate" last_modification_time="Fri, 28 Apr 2006 12:17:29 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkCheckMenuItem" id="full_screen1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Full screen</property>\r
-                     <property name="use_underline">True</property>\r
-                     <property name="active">False</property>\r
-                     <signal name="activate" handler="on_full_screen1_activate" last_modification_time="Fri, 28 Apr 2006 12:17:29 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-               </widget>\r
-             </child>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkMenuItem" id="e-mail1">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">E-m_ail</property>\r
-             <property name="use_underline">True</property>\r
-             <signal name="activate" handler="on_e-mail1_activate" last_modification_time="Fri, 28 Apr 2006 12:12:02 GMT"/>\r
-\r
-             <child>\r
-               <widget class="GtkMenu" id="e-mail1_menu">\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="send_&amp;_receive1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Send &amp; receive</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_send_&amp;_receive1_activate" last_modification_time="Fri, 28 Apr 2006 12:21:50 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="retrieve_e-mail_contents1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Retrieve e-mail contents</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_retrieve_e-mail_contents1_activate" last_modification_time="Fri, 28 Apr 2006 12:21:50 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="purge_attacments1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Purge attacments</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_purge_attacments1_activate" last_modification_time="Fri, 28 Apr 2006 12:21:50 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-               </widget>\r
-             </child>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkMenuItem" id="tools1">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">_Tools</property>\r
-             <property name="use_underline">True</property>\r
-             <signal name="activate" handler="on_tools1_activate" last_modification_time="Fri, 28 Apr 2006 12:12:02 GMT"/>\r
-\r
-             <child>\r
-               <widget class="GtkMenu" id="tools1_menu">\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="open_contacts1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Open contacts...</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_open_contacts1_activate" last_modification_time="Fri, 28 Apr 2006 12:23:17 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkSeparatorMenuItem" id="separator11">\r
-                     <property name="visible">True</property>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="new_account1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">New account...</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_new_account1_activate" last_modification_time="Fri, 28 Apr 2006 12:23:17 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="account_settings1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Account settings...</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_account_settings1_activate" last_modification_time="Fri, 28 Apr 2006 12:23:17 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="options1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Options</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_options1_activate" last_modification_time="Fri, 28 Apr 2006 12:23:17 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkSeparatorMenuItem" id="separator10">\r
-                     <property name="visible">True</property>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="search_e-mails1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Search e-mails...</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_search_e-mails1_activate" last_modification_time="Fri, 28 Apr 2006 12:23:17 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkSeparatorMenuItem" id="separator12">\r
-                     <property name="visible">True</property>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="help1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Help</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_help1_activate" last_modification_time="Fri, 28 Apr 2006 12:23:17 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-               </widget>\r
-             </child>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkMenuItem" id="close1">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">_Close</property>\r
-             <property name="use_underline">True</property>\r
-\r
-             <child>\r
-               <widget class="GtkMenu" id="close1_menu">\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="about1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Close window</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_about1_activate" last_modification_time="Fri, 28 Apr 2006 11:10:18 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="close_all_windows1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Close all windows</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_close_all_windows1_activate" last_modification_time="Fri, 28 Apr 2006 12:24:02 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-               </widget>\r
-             </child>\r
-           </widget>\r
-         </child>\r
-       </widget>\r
-       <packing>\r
-         <property name="padding">0</property>\r
-         <property name="expand">False</property>\r
-         <property name="fill">False</property>\r
-       </packing>\r
-      </child>\r
-\r
-      <child>\r
-       <widget class="GtkToolbar" id="toolbar1">\r
-         <property name="visible">True</property>\r
-         <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>\r
-         <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>\r
-         <property name="tooltips">True</property>\r
-         <property name="show_arrow">True</property>\r
-\r
-         <child>\r
-           <widget class="GtkToolButton" id="toolb_new_mail">\r
-             <property name="visible">True</property>\r
-             <property name="tooltip" translatable="yes">Compose new e-mail message</property>\r
-             <property name="label" translatable="yes">New e-mail</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="icon">qgn_toolb_messagin_new.png</property>\r
-             <property name="visible_horizontal">True</property>\r
-             <property name="visible_vertical">True</property>\r
-             <property name="is_important">False</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="expand">False</property>\r
-             <property name="homogeneous">True</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkToolButton" id="toolb_reply">\r
-             <property name="visible">True</property>\r
-             <property name="tooltip" translatable="yes">Reply</property>\r
-             <property name="label" translatable="yes">Reply</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="icon">qgn_toolb_messagin_reply.png</property>\r
-             <property name="visible_horizontal">True</property>\r
-             <property name="visible_vertical">True</property>\r
-             <property name="is_important">False</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="expand">False</property>\r
-             <property name="homogeneous">True</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkToolButton" id="toolb_reply_all">\r
-             <property name="visible">True</property>\r
-             <property name="tooltip" translatable="yes">Reply all</property>\r
-             <property name="label" translatable="yes">Reply all</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="icon">qgn_toolb_messagin_replytoall.png</property>\r
-             <property name="visible_horizontal">True</property>\r
-             <property name="visible_vertical">True</property>\r
-             <property name="is_important">False</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="expand">False</property>\r
-             <property name="homogeneous">True</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkToolButton" id="toolb_forward">\r
-             <property name="visible">True</property>\r
-             <property name="tooltip" translatable="yes">Forward</property>\r
-             <property name="label" translatable="yes">Forward</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="icon">qgn_toolb_messagin_forward.png</property>\r
-             <property name="visible_horizontal">True</property>\r
-             <property name="visible_vertical">True</property>\r
-             <property name="is_important">False</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="expand">False</property>\r
-             <property name="homogeneous">True</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkToolButton" id="toolb_move_to">\r
-             <property name="visible">True</property>\r
-             <property name="tooltip" translatable="yes">Move message to other location</property>\r
-             <property name="label" translatable="yes">Move to...</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="icon">qgn_toolb_messagin_moveto.png</property>\r
-             <property name="visible_horizontal">True</property>\r
-             <property name="visible_vertical">True</property>\r
-             <property name="is_important">False</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="expand">False</property>\r
-             <property name="homogeneous">True</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkToolButton" id="toolb_delete">\r
-             <property name="visible">True</property>\r
-             <property name="tooltip" translatable="yes">Delete message</property>\r
-             <property name="label" translatable="yes">Delete</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="icon">qgn_toolb_messagin_delete.png</property>\r
-             <property name="visible_horizontal">True</property>\r
-             <property name="visible_vertical">True</property>\r
-             <property name="is_important">False</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="expand">False</property>\r
-             <property name="homogeneous">True</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkToolButton" id="toolb_send_receive">\r
-             <property name="visible">True</property>\r
-             <property name="tooltip" translatable="yes">Send and receive</property>\r
-             <property name="label" translatable="yes">Send &amp; receive</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="icon">qgn_toolb_messagin_sendreceive.png</property>\r
-             <property name="visible_horizontal">True</property>\r
-             <property name="visible_vertical">True</property>\r
-             <property name="is_important">False</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="expand">False</property>\r
-             <property name="homogeneous">True</property>\r
-           </packing>\r
-         </child>\r
-       </widget>\r
-       <packing>\r
-         <property name="padding">0</property>\r
-         <property name="expand">False</property>\r
-         <property name="fill">False</property>\r
-       </packing>\r
-      </child>\r
-\r
-      <child>\r
-       <widget class="GtkHPaned" id="hpaned1">\r
-         <property name="visible">True</property>\r
-         <property name="can_focus">True</property>\r
-         <property name="position">170</property>\r
-\r
-         <child>\r
-           <widget class="GtkScrolledWindow" id="folders">\r
-             <property name="visible">True</property>\r
-             <property name="can_focus">True</property>\r
-             <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>\r
-             <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>\r
-             <property name="shadow_type">GTK_SHADOW_NONE</property>\r
-             <property name="window_placement">GTK_CORNER_TOP_LEFT</property>\r
-\r
-             <child>\r
-               <placeholder/>\r
-             </child>\r
-           </widget>\r
-           <packing>\r
-             <property name="shrink">True</property>\r
-             <property name="resize">False</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkVPaned" id="vpaned1">\r
-             <property name="visible">True</property>\r
-             <property name="can_focus">True</property>\r
-             <property name="position">150</property>\r
-\r
-             <child>\r
-               <widget class="GtkScrolledWindow" id="mail_list">\r
-                 <property name="visible">True</property>\r
-                 <property name="can_focus">True</property>\r
-                 <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>\r
-                 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>\r
-                 <property name="shadow_type">GTK_SHADOW_NONE</property>\r
-                 <property name="window_placement">GTK_CORNER_TOP_LEFT</property>\r
-\r
-                 <child>\r
-                   <placeholder/>\r
-                 </child>\r
-               </widget>\r
-               <packing>\r
-                 <property name="shrink">True</property>\r
-                 <property name="resize">False</property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkScrolledWindow" id="mail_view">\r
-                 <property name="visible">True</property>\r
-                 <property name="can_focus">True</property>\r
-                 <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>\r
-                 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>\r
-                 <property name="shadow_type">GTK_SHADOW_NONE</property>\r
-                 <property name="window_placement">GTK_CORNER_TOP_LEFT</property>\r
-\r
-                 <child>\r
-                   <placeholder/>\r
-                 </child>\r
-               </widget>\r
-               <packing>\r
-                 <property name="shrink">True</property>\r
-                 <property name="resize">True</property>\r
-               </packing>\r
-             </child>\r
-           </widget>\r
-           <packing>\r
-             <property name="shrink">True</property>\r
-             <property name="resize">True</property>\r
-           </packing>\r
-         </child>\r
-       </widget>\r
-       <packing>\r
-         <property name="padding">0</property>\r
-         <property name="expand">True</property>\r
-         <property name="fill">True</property>\r
-       </packing>\r
-      </child>\r
-    </widget>\r
-  </child>\r
-</widget>\r
-\r
-<widget class="GtkWindow" id="new_mail">\r
-  <property name="visible">True</property>\r
-  <property name="title" translatable="yes">Modest - New message</property>\r
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>\r
-  <property name="window_position">GTK_WIN_POS_NONE</property>\r
-  <property name="modal">False</property>\r
-  <property name="default_width">800</property>\r
-  <property name="default_height">600</property>\r
-  <property name="resizable">True</property>\r
-  <property name="destroy_with_parent">False</property>\r
-  <property name="icon">qgn_toolb_messagin.png</property>\r
-  <property name="decorated">True</property>\r
-  <property name="skip_taskbar_hint">False</property>\r
-  <property name="skip_pager_hint">False</property>\r
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>\r
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>\r
-  <property name="focus_on_map">True</property>\r
-  <property name="urgency_hint">False</property>\r
-\r
-  <child>\r
-    <widget class="GtkVBox" id="vbox2">\r
-      <property name="visible">True</property>\r
-      <property name="homogeneous">False</property>\r
-      <property name="spacing">0</property>\r
-\r
-      <child>\r
-       <widget class="GtkMenuBar" id="menubar2">\r
-         <property name="visible">True</property>\r
-         <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>\r
-         <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>\r
-\r
-         <child>\r
-           <widget class="GtkMenuItem" id="menuitem5">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">_Message</property>\r
-             <property name="use_underline">True</property>\r
-\r
-             <child>\r
-               <widget class="GtkMenu" id="menuitem5_menu">\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem6">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Send</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_new_e-mail1_activate" last_modification_time="Fri, 28 Apr 2006 11:10:18 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkSeparatorMenuItem" id="separator13">\r
-                     <property name="visible">True</property>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem7">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">New e-mail</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_open1_activate" last_modification_time="Fri, 28 Apr 2006 11:10:18 GMT"/>\r
-                     <accelerator key="O" modifiers="GDK_CONTROL_MASK" signal="activate"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkSeparatorMenuItem" id="separatormenuitem1">\r
-                     <property name="visible">True</property>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem8">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Delete message</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_reply1_activate" last_modification_time="Fri, 28 Apr 2006 11:10:18 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkSeparatorMenuItem" id="separator14">\r
-                     <property name="visible">True</property>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem9">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Select recipients...</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_reply_to_all1_activate" last_modification_time="Fri, 28 Apr 2006 11:10:18 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem10">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Check names</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_forward1_activate" last_modification_time="Fri, 28 Apr 2006 12:05:09 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-               </widget>\r
-             </child>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkMenuItem" id="menuitem13">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">_Edit</property>\r
-             <property name="use_underline">True</property>\r
-\r
-             <child>\r
-               <widget class="GtkMenu" id="menuitem13_menu">\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem14">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Undo</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_undo1_activate" last_modification_time="Fri, 28 Apr 2006 11:10:18 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkSeparatorMenuItem" id="separatormenuitem4">\r
-                     <property name="visible">True</property>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem15">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Cut</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_cut1_activate" last_modification_time="Fri, 28 Apr 2006 11:10:18 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem16">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Copy</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_copy1_activate" last_modification_time="Fri, 28 Apr 2006 11:10:18 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem17">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Paste</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_paste1_activate" last_modification_time="Fri, 28 Apr 2006 11:10:18 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem18">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Select all</property>\r
-                     <property name="use_underline">True</property>\r
-                   </widget>\r
-                 </child>\r
-               </widget>\r
-             </child>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkMenuItem" id="menuitem22">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">_Attachments</property>\r
-             <property name="use_underline">True</property>\r
-\r
-             <child>\r
-               <widget class="GtkMenu" id="menuitem22_menu">\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem23">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Attach file...</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_new_folder1_activate" last_modification_time="Fri, 28 Apr 2006 12:15:47 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem24">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Insert inline image</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_manage_folders1_activate" last_modification_time="Fri, 28 Apr 2006 12:15:47 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkSeparatorMenuItem" id="separator15">\r
-                     <property name="visible">True</property>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem25">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Remove attachment</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_details2_activate" last_modification_time="Fri, 28 Apr 2006 12:15:47 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-               </widget>\r
-             </child>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkMenuItem" id="menuitem27">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">_View</property>\r
-             <property name="use_underline">True</property>\r
-\r
-             <child>\r
-               <widget class="GtkMenu" id="menuitem27_menu">\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem28">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">_Zoom</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_sort1_activate" last_modification_time="Fri, 28 Apr 2006 12:17:29 GMT"/>\r
-\r
-                     <child>\r
-                       <widget class="GtkMenu" id="menuitem28_menu">\r
-\r
-                         <child>\r
-                           <widget class="GtkRadioMenuItem" id="50%1">\r
-                             <property name="visible">True</property>\r
-                             <property name="label" translatable="yes">50%</property>\r
-                             <property name="use_underline">True</property>\r
-                             <property name="active">True</property>\r
-                             <signal name="activate" handler="on_50%1_activate" last_modification_time="Fri, 28 Apr 2006 13:25:43 GMT"/>\r
-                           </widget>\r
-                         </child>\r
-\r
-                         <child>\r
-                           <widget class="GtkRadioMenuItem" id="100%1">\r
-                             <property name="visible">True</property>\r
-                             <property name="label" translatable="yes">100%</property>\r
-                             <property name="use_underline">True</property>\r
-                             <property name="active">True</property>\r
-                             <property name="group">50%1</property>\r
-                             <signal name="activate" handler="on_100%1_activate" last_modification_time="Fri, 28 Apr 2006 13:25:43 GMT"/>\r
-                           </widget>\r
-                         </child>\r
-\r
-                         <child>\r
-                           <widget class="GtkRadioMenuItem" id="150%1">\r
-                             <property name="visible">True</property>\r
-                             <property name="label" translatable="yes">150%</property>\r
-                             <property name="use_underline">True</property>\r
-                             <property name="active">True</property>\r
-                             <property name="group">50%1</property>\r
-                             <signal name="activate" handler="on_150%1_activate" last_modification_time="Fri, 28 Apr 2006 13:25:43 GMT"/>\r
-                           </widget>\r
-                         </child>\r
-\r
-                         <child>\r
-                           <widget class="GtkRadioMenuItem" id="200%1">\r
-                             <property name="visible">True</property>\r
-                             <property name="label" translatable="yes">200%</property>\r
-                             <property name="use_underline">True</property>\r
-                             <property name="active">True</property>\r
-                             <property name="group">50%1</property>\r
-                             <signal name="activate" handler="on_200%1_activate" last_modification_time="Fri, 28 Apr 2006 13:25:43 GMT"/>\r
-                           </widget>\r
-                         </child>\r
-                       </widget>\r
-                     </child>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem29">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Show toolbar</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_show_toolbar1_activate" last_modification_time="Fri, 28 Apr 2006 12:17:29 GMT"/>\r
-\r
-                     <child>\r
-                       <widget class="GtkMenu" id="menuitem29_menu">\r
-\r
-                         <child>\r
-                           <widget class="GtkCheckMenuItem" id="checkmenuitem1">\r
-                             <property name="visible">True</property>\r
-                             <property name="label" translatable="yes">Normal screen</property>\r
-                             <property name="use_underline">True</property>\r
-                             <property name="active">True</property>\r
-                             <signal name="activate" handler="on_normal_screen1_activate" last_modification_time="Fri, 28 Apr 2006 12:17:29 GMT"/>\r
-                           </widget>\r
-                         </child>\r
-\r
-                         <child>\r
-                           <widget class="GtkCheckMenuItem" id="checkmenuitem2">\r
-                             <property name="visible">True</property>\r
-                             <property name="label" translatable="yes">Full screen</property>\r
-                             <property name="use_underline">True</property>\r
-                             <property name="active">True</property>\r
-                             <signal name="activate" handler="on_full_screen2_activate" last_modification_time="Fri, 28 Apr 2006 12:17:29 GMT"/>\r
-                           </widget>\r
-                         </child>\r
-                       </widget>\r
-                     </child>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkCheckMenuItem" id="checkmenuitem4">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Full screen</property>\r
-                     <property name="use_underline">True</property>\r
-                     <property name="active">False</property>\r
-                     <signal name="activate" handler="on_full_screen1_activate" last_modification_time="Fri, 28 Apr 2006 12:17:29 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkSeparatorMenuItem" id="separator16">\r
-                     <property name="visible">True</property>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkCheckMenuItem" id="show_cc1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Show Cc</property>\r
-                     <property name="use_underline">True</property>\r
-                     <property name="active">False</property>\r
-                     <signal name="activate" handler="on_show_cc1_activate" last_modification_time="Fri, 28 Apr 2006 13:25:43 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkCheckMenuItem" id="show_bcc1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Show Bcc</property>\r
-                     <property name="use_underline">True</property>\r
-                     <property name="active">False</property>\r
-                     <signal name="activate" handler="on_show_bcc1_activate" last_modification_time="Fri, 28 Apr 2006 13:25:43 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-               </widget>\r
-             </child>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkMenuItem" id="menuitem30">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">_Format</property>\r
-             <property name="use_underline">True</property>\r
-             <signal name="activate" handler="on_e-mail1_activate" last_modification_time="Fri, 28 Apr 2006 12:12:02 GMT"/>\r
-\r
-             <child>\r
-               <widget class="GtkMenu" id="menuitem30_menu">\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem31">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Font...</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_send_&amp;_receive1_activate" last_modification_time="Fri, 28 Apr 2006 12:21:50 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem32">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Bullets</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_retrieve_e-mail_contents1_activate" last_modification_time="Fri, 28 Apr 2006 12:21:50 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem33">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Numbers</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_purge_attacments1_activate" last_modification_time="Fri, 28 Apr 2006 12:21:50 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="alignment1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Alignment</property>\r
-                     <property name="use_underline">True</property>\r
-\r
-                     <child>\r
-                       <widget class="GtkMenu" id="alignment1_menu">\r
-\r
-                         <child>\r
-                           <widget class="GtkRadioMenuItem" id="left1">\r
-                             <property name="visible">True</property>\r
-                             <property name="label" translatable="yes">Left</property>\r
-                             <property name="use_underline">True</property>\r
-                             <property name="active">True</property>\r
-                             <signal name="activate" handler="on_left1_activate" last_modification_time="Fri, 28 Apr 2006 13:28:18 GMT"/>\r
-                           </widget>\r
-                         </child>\r
-\r
-                         <child>\r
-                           <widget class="GtkRadioMenuItem" id="center1">\r
-                             <property name="visible">True</property>\r
-                             <property name="label" translatable="yes">Center</property>\r
-                             <property name="use_underline">True</property>\r
-                             <property name="active">True</property>\r
-                             <property name="group">left1</property>\r
-                             <signal name="activate" handler="on_center1_activate" last_modification_time="Fri, 28 Apr 2006 13:28:18 GMT"/>\r
-                           </widget>\r
-                         </child>\r
-\r
-                         <child>\r
-                           <widget class="GtkRadioMenuItem" id="right1">\r
-                             <property name="visible">True</property>\r
-                             <property name="label" translatable="yes">Right</property>\r
-                             <property name="use_underline">True</property>\r
-                             <property name="active">True</property>\r
-                             <property name="group">left1</property>\r
-                             <signal name="activate" handler="on_right1_activate" last_modification_time="Fri, 28 Apr 2006 13:28:18 GMT"/>\r
-                           </widget>\r
-                         </child>\r
-                       </widget>\r
-                     </child>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="background_colour1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Background colour</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_background_colour1_activate" last_modification_time="Fri, 28 Apr 2006 13:28:54 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-               </widget>\r
-             </child>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkMenuItem" id="menuitem34">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">_Tools</property>\r
-             <property name="use_underline">True</property>\r
-             <signal name="activate" handler="on_tools1_activate" last_modification_time="Fri, 28 Apr 2006 12:12:02 GMT"/>\r
-\r
-             <child>\r
-               <widget class="GtkMenu" id="menuitem34_menu">\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem35">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Sending options...</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_open_contacts1_activate" last_modification_time="Fri, 28 Apr 2006 12:23:17 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkSeparatorMenuItem" id="separatormenuitem9">\r
-                     <property name="visible">True</property>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem36">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Find on page...</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_new_account1_activate" last_modification_time="Fri, 28 Apr 2006 12:23:17 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem39">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Search e-mails...</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_search_e-mails1_activate" last_modification_time="Fri, 28 Apr 2006 12:23:17 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkSeparatorMenuItem" id="separatormenuitem11">\r
-                     <property name="visible">True</property>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem40">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Help</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_help1_activate" last_modification_time="Fri, 28 Apr 2006 12:23:17 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-               </widget>\r
-             </child>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkMenuItem" id="security1">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">_Security</property>\r
-             <property name="use_underline">True</property>\r
-             <signal name="activate" handler="on_security1_activate" last_modification_time="Fri, 28 Apr 2006 13:30:35 GMT"/>\r
-\r
-             <child>\r
-               <widget class="GtkMenu" id="security1_menu">\r
-\r
-                 <child>\r
-                   <widget class="GtkRadioMenuItem" id="none1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">None</property>\r
-                     <property name="use_underline">True</property>\r
-                     <property name="active">True</property>\r
-                     <signal name="activate" handler="on_none1_activate" last_modification_time="Fri, 28 Apr 2006 13:32:29 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkRadioMenuItem" id="encrypt1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Encrypt</property>\r
-                     <property name="use_underline">True</property>\r
-                     <property name="active">True</property>\r
-                     <property name="group">none1</property>\r
-                     <signal name="activate" handler="on_encrypt1_activate" last_modification_time="Fri, 28 Apr 2006 13:32:29 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkRadioMenuItem" id="digitally_sign1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Digitally sign</property>\r
-                     <property name="use_underline">True</property>\r
-                     <property name="active">True</property>\r
-                     <property name="group">none1</property>\r
-                     <signal name="activate" handler="on_digitally_sign1_activate" last_modification_time="Fri, 28 Apr 2006 13:32:29 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkRadioMenuItem" id="digitally_sign_and_encrypt1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Digitally sign and encrypt</property>\r
-                     <property name="use_underline">True</property>\r
-                     <property name="active">True</property>\r
-                     <property name="group">none1</property>\r
-                     <signal name="activate" handler="on_digitally_sign_and_encrypt1_activate" last_modification_time="Fri, 28 Apr 2006 13:32:29 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-               </widget>\r
-             </child>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkMenuItem" id="menuitem41">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">_Close</property>\r
-             <property name="use_underline">True</property>\r
-\r
-             <child>\r
-               <widget class="GtkMenu" id="menuitem41_menu">\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem42">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Close window</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_about1_activate" last_modification_time="Fri, 28 Apr 2006 11:10:18 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem43">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Close all windows</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_close_all_windows1_activate" last_modification_time="Fri, 28 Apr 2006 12:24:02 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-               </widget>\r
-             </child>\r
-           </widget>\r
-         </child>\r
-       </widget>\r
-       <packing>\r
-         <property name="padding">0</property>\r
-         <property name="expand">False</property>\r
-         <property name="fill">False</property>\r
-       </packing>\r
-      </child>\r
-\r
-      <child>\r
-       <widget class="GtkToolbar" id="toolbar2">\r
-         <property name="visible">True</property>\r
-         <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>\r
-         <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>\r
-         <property name="tooltips">True</property>\r
-         <property name="show_arrow">True</property>\r
-\r
-         <child>\r
-           <widget class="GtkToolButton" id="toolb_send">\r
-             <property name="visible">True</property>\r
-             <property name="tooltip" translatable="yes">Send message</property>\r
-             <property name="label" translatable="yes">Send</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="icon">qgn_toolb_messagin_send.png</property>\r
-             <property name="visible_horizontal">True</property>\r
-             <property name="visible_vertical">True</property>\r
-             <property name="is_important">False</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="expand">False</property>\r
-             <property name="homogeneous">True</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkToolButton" id="toolb_attach">\r
-             <property name="visible">True</property>\r
-             <property name="tooltip" translatable="yes">Add attachment</property>\r
-             <property name="label" translatable="yes">Attach</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="icon">qgn_list_gene_attacpap.png</property>\r
-             <property name="visible_horizontal">True</property>\r
-             <property name="visible_vertical">True</property>\r
-             <property name="is_important">False</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="expand">False</property>\r
-             <property name="homogeneous">True</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkToolButton" id="toolb_recipients">\r
-             <property name="visible">True</property>\r
-             <property name="tooltip" translatable="yes">Add reipients</property>\r
-             <property name="label" translatable="yes">Recipients</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="icon">qgn_list_gene_contacts.png</property>\r
-             <property name="visible_horizontal">True</property>\r
-             <property name="visible_vertical">True</property>\r
-             <property name="is_important">False</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="expand">False</property>\r
-             <property name="homogeneous">True</property>\r
-           </packing>\r
-         </child>\r
-       </widget>\r
-       <packing>\r
-         <property name="padding">0</property>\r
-         <property name="expand">False</property>\r
-         <property name="fill">False</property>\r
-       </packing>\r
-      </child>\r
-\r
-      <child>\r
-       <widget class="GtkVPaned" id="vpaned2">\r
-         <property name="visible">True</property>\r
-         <property name="can_focus">True</property>\r
-         <property name="position">65</property>\r
-\r
-         <child>\r
-           <widget class="GtkTable" id="table1">\r
-             <property name="border_width">10</property>\r
-             <property name="visible">True</property>\r
-             <property name="n_rows">2</property>\r
-             <property name="n_columns">2</property>\r
-             <property name="homogeneous">False</property>\r
-             <property name="row_spacing">10</property>\r
-             <property name="column_spacing">10</property>\r
-\r
-             <child>\r
-               <widget class="GtkLabel" id="label1">\r
-                 <property name="visible">True</property>\r
-                 <property name="label" translatable="yes">To:</property>\r
-                 <property name="use_underline">False</property>\r
-                 <property name="use_markup">False</property>\r
-                 <property name="justify">GTK_JUSTIFY_RIGHT</property>\r
-                 <property name="wrap">False</property>\r
-                 <property name="selectable">False</property>\r
-                 <property name="xalign">0</property>\r
-                 <property name="yalign">0.5</property>\r
-                 <property name="xpad">0</property>\r
-                 <property name="ypad">0</property>\r
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                 <property name="width_chars">-1</property>\r
-                 <property name="single_line_mode">False</property>\r
-                 <property name="angle">0</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">0</property>\r
-                 <property name="right_attach">1</property>\r
-                 <property name="top_attach">0</property>\r
-                 <property name="bottom_attach">1</property>\r
-                 <property name="x_options">fill</property>\r
-                 <property name="y_options"></property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkLabel" id="label2">\r
-                 <property name="visible">True</property>\r
-                 <property name="label" translatable="yes">Subject:</property>\r
-                 <property name="use_underline">False</property>\r
-                 <property name="use_markup">False</property>\r
-                 <property name="justify">GTK_JUSTIFY_RIGHT</property>\r
-                 <property name="wrap">False</property>\r
-                 <property name="selectable">False</property>\r
-                 <property name="xalign">0</property>\r
-                 <property name="yalign">0.5</property>\r
-                 <property name="xpad">0</property>\r
-                 <property name="ypad">0</property>\r
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                 <property name="width_chars">-1</property>\r
-                 <property name="single_line_mode">False</property>\r
-                 <property name="angle">0</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">0</property>\r
-                 <property name="right_attach">1</property>\r
-                 <property name="top_attach">1</property>\r
-                 <property name="bottom_attach">2</property>\r
-                 <property name="x_options">fill</property>\r
-                 <property name="y_options"></property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkEntry" id="entry2">\r
-                 <property name="visible">True</property>\r
-                 <property name="can_focus">True</property>\r
-                 <property name="editable">True</property>\r
-                 <property name="visibility">True</property>\r
-                 <property name="max_length">0</property>\r
-                 <property name="text" translatable="yes"></property>\r
-                 <property name="has_frame">True</property>\r
-                 <property name="invisible_char">*</property>\r
-                 <property name="activates_default">False</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">1</property>\r
-                 <property name="right_attach">2</property>\r
-                 <property name="top_attach">0</property>\r
-                 <property name="bottom_attach">1</property>\r
-                 <property name="y_options"></property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkEntry" id="entry3">\r
-                 <property name="visible">True</property>\r
-                 <property name="can_focus">True</property>\r
-                 <property name="editable">True</property>\r
-                 <property name="visibility">True</property>\r
-                 <property name="max_length">0</property>\r
-                 <property name="text" translatable="yes"></property>\r
-                 <property name="has_frame">True</property>\r
-                 <property name="invisible_char">*</property>\r
-                 <property name="activates_default">False</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">1</property>\r
-                 <property name="right_attach">2</property>\r
-                 <property name="top_attach">1</property>\r
-                 <property name="bottom_attach">2</property>\r
-                 <property name="y_options"></property>\r
-               </packing>\r
-             </child>\r
-           </widget>\r
-           <packing>\r
-             <property name="shrink">True</property>\r
-             <property name="resize">False</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkScrolledWindow" id="scrolledwindow9">\r
-             <property name="visible">True</property>\r
-             <property name="can_focus">True</property>\r
-             <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>\r
-             <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>\r
-             <property name="shadow_type">GTK_SHADOW_IN</property>\r
-             <property name="window_placement">GTK_CORNER_TOP_LEFT</property>\r
-\r
-             <child>\r
-               <widget class="GtkTextView" id="textview1">\r
-                 <property name="visible">True</property>\r
-                 <property name="can_focus">True</property>\r
-                 <property name="editable">True</property>\r
-                 <property name="overwrite">False</property>\r
-                 <property name="accepts_tab">True</property>\r
-                 <property name="justification">GTK_JUSTIFY_LEFT</property>\r
-                 <property name="wrap_mode">GTK_WRAP_NONE</property>\r
-                 <property name="cursor_visible">True</property>\r
-                 <property name="pixels_above_lines">0</property>\r
-                 <property name="pixels_below_lines">0</property>\r
-                 <property name="pixels_inside_wrap">0</property>\r
-                 <property name="left_margin">0</property>\r
-                 <property name="right_margin">0</property>\r
-                 <property name="indent">0</property>\r
-                 <property name="text" translatable="yes">     </property>\r
-               </widget>\r
-             </child>\r
-           </widget>\r
-           <packing>\r
-             <property name="shrink">True</property>\r
-             <property name="resize">True</property>\r
-           </packing>\r
-         </child>\r
-       </widget>\r
-       <packing>\r
-         <property name="padding">0</property>\r
-         <property name="expand">True</property>\r
-         <property name="fill">True</property>\r
-       </packing>\r
-      </child>\r
-    </widget>\r
-  </child>\r
-</widget>\r
-\r
-<widget class="GtkWindow" id="viewer">\r
-  <property name="visible">True</property>\r
-  <property name="title" translatable="yes">Modest - Message viewer</property>\r
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>\r
-  <property name="window_position">GTK_WIN_POS_NONE</property>\r
-  <property name="modal">False</property>\r
-  <property name="default_width">800</property>\r
-  <property name="default_height">600</property>\r
-  <property name="resizable">True</property>\r
-  <property name="destroy_with_parent">False</property>\r
-  <property name="icon">qgn_toolb_messagin.png</property>\r
-  <property name="decorated">True</property>\r
-  <property name="skip_taskbar_hint">False</property>\r
-  <property name="skip_pager_hint">False</property>\r
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>\r
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>\r
-  <property name="focus_on_map">True</property>\r
-  <property name="urgency_hint">False</property>\r
-\r
-  <child>\r
-    <widget class="GtkVBox" id="vbox3">\r
-      <property name="visible">True</property>\r
-      <property name="homogeneous">False</property>\r
-      <property name="spacing">0</property>\r
-\r
-      <child>\r
-       <widget class="GtkMenuBar" id="menubar3">\r
-         <property name="visible">True</property>\r
-         <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>\r
-         <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>\r
-\r
-         <child>\r
-           <widget class="GtkMenuItem" id="menuitem44">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">_Message</property>\r
-             <property name="use_underline">True</property>\r
-\r
-             <child>\r
-               <widget class="GtkMenu" id="menuitem44_menu">\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="reply">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Reply</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_new_reply_activate" last_modification_time="Wed, 03 May 2006 12:23:21 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="reply_to_all2">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Reply to all</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_reply_to_all_activate" last_modification_time="Wed, 03 May 2006 12:23:21 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="forward2">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Forward</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_forward2_activate" last_modification_time="Wed, 03 May 2006 12:16:14 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkSeparatorMenuItem" id="separatormenuitem12">\r
-                     <property name="visible">True</property>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem46">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">New e-mail</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_open1_activate" last_modification_time="Fri, 28 Apr 2006 11:10:18 GMT"/>\r
-                     <accelerator key="N" modifiers="GDK_CONTROL_MASK" signal="activate"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkSeparatorMenuItem" id="separatormenuitem13">\r
-                     <property name="visible">True</property>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem47">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Delete</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_delete_activate" last_modification_time="Wed, 03 May 2006 12:16:14 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-               </widget>\r
-             </child>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkMenuItem" id="menuitem50">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">_Edit</property>\r
-             <property name="use_underline">True</property>\r
-\r
-             <child>\r
-               <widget class="GtkMenu" id="menuitem50_menu">\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem52">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Cut</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_cut1_activate" last_modification_time="Fri, 28 Apr 2006 11:10:18 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem53">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Copy</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_copy1_activate" last_modification_time="Fri, 28 Apr 2006 11:10:18 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem54">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Paste</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_paste1_activate" last_modification_time="Fri, 28 Apr 2006 11:10:18 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem55">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Select all</property>\r
-                     <property name="use_underline">True</property>\r
-                   </widget>\r
-                 </child>\r
-               </widget>\r
-             </child>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkMenuItem" id="menuitem56">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">_Attachments</property>\r
-             <property name="use_underline">True</property>\r
-\r
-             <child>\r
-               <widget class="GtkMenu" id="menuitem56_menu">\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="view_attacments">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">View</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_view_attachments_activate" last_modification_time="Wed, 03 May 2006 12:20:03 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="save_attachments">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Save attachments...</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_save_attachments_activate" last_modification_time="Wed, 03 May 2006 12:20:03 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="purge_attachments">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Purge attachments</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_purge_attachments_activate" last_modification_time="Wed, 03 May 2006 12:20:03 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-               </widget>\r
-             </child>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkMenuItem" id="menuitem60">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">_View</property>\r
-             <property name="use_underline">True</property>\r
-\r
-             <child>\r
-               <widget class="GtkMenu" id="menuitem60_menu">\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem61">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Zoom</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_sort1_activate" last_modification_time="Fri, 28 Apr 2006 12:17:29 GMT"/>\r
-\r
-                     <child>\r
-                       <widget class="GtkMenu" id="menuitem61_menu">\r
-\r
-                         <child>\r
-                           <widget class="GtkRadioMenuItem" id="radiomenuitem1">\r
-                             <property name="visible">True</property>\r
-                             <property name="label" translatable="yes">50%</property>\r
-                             <property name="use_underline">True</property>\r
-                             <property name="active">True</property>\r
-                             <signal name="activate" handler="on_50%1_activate" last_modification_time="Fri, 28 Apr 2006 13:25:43 GMT"/>\r
-                           </widget>\r
-                         </child>\r
-\r
-                         <child>\r
-                           <widget class="GtkRadioMenuItem" id="radiomenuitem2">\r
-                             <property name="visible">True</property>\r
-                             <property name="label" translatable="yes">100%</property>\r
-                             <property name="use_underline">True</property>\r
-                             <property name="active">True</property>\r
-                             <signal name="activate" handler="on_100%1_activate" last_modification_time="Fri, 28 Apr 2006 13:25:43 GMT"/>\r
-                           </widget>\r
-                         </child>\r
-\r
-                         <child>\r
-                           <widget class="GtkRadioMenuItem" id="radiomenuitem3">\r
-                             <property name="visible">True</property>\r
-                             <property name="label" translatable="yes">150%</property>\r
-                             <property name="use_underline">True</property>\r
-                             <property name="active">True</property>\r
-                             <signal name="activate" handler="on_150%1_activate" last_modification_time="Fri, 28 Apr 2006 13:25:43 GMT"/>\r
-                           </widget>\r
-                         </child>\r
-\r
-                         <child>\r
-                           <widget class="GtkRadioMenuItem" id="radiomenuitem4">\r
-                             <property name="visible">True</property>\r
-                             <property name="label" translatable="yes">200%</property>\r
-                             <property name="use_underline">True</property>\r
-                             <property name="active">True</property>\r
-                             <signal name="activate" handler="on_200%1_activate" last_modification_time="Fri, 28 Apr 2006 13:25:43 GMT"/>\r
-                           </widget>\r
-                         </child>\r
-                       </widget>\r
-                     </child>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem62">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Show toolbar</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_show_toolbar1_activate" last_modification_time="Fri, 28 Apr 2006 12:17:29 GMT"/>\r
-\r
-                     <child>\r
-                       <widget class="GtkMenu" id="menuitem62_menu">\r
-\r
-                         <child>\r
-                           <widget class="GtkCheckMenuItem" id="checkmenuitem5">\r
-                             <property name="visible">True</property>\r
-                             <property name="label" translatable="yes">Normal screen</property>\r
-                             <property name="use_underline">True</property>\r
-                             <property name="active">True</property>\r
-                             <signal name="activate" handler="on_normal_screen1_activate" last_modification_time="Fri, 28 Apr 2006 12:17:29 GMT"/>\r
-                           </widget>\r
-                         </child>\r
-\r
-                         <child>\r
-                           <widget class="GtkCheckMenuItem" id="checkmenuitem6">\r
-                             <property name="visible">True</property>\r
-                             <property name="label" translatable="yes">Full screen</property>\r
-                             <property name="use_underline">True</property>\r
-                             <property name="active">True</property>\r
-                             <signal name="activate" handler="on_full_screen2_activate" last_modification_time="Fri, 28 Apr 2006 12:17:29 GMT"/>\r
-                           </widget>\r
-                         </child>\r
-                       </widget>\r
-                     </child>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkCheckMenuItem" id="checkmenuitem7">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Full screen</property>\r
-                     <property name="use_underline">True</property>\r
-                     <property name="active">False</property>\r
-                     <signal name="activate" handler="on_full_screen1_activate" last_modification_time="Fri, 28 Apr 2006 12:17:29 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkSeparatorMenuItem" id="separatormenuitem17">\r
-                     <property name="visible">True</property>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkCheckMenuItem" id="checkmenuitem8">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Next message</property>\r
-                     <property name="use_underline">True</property>\r
-                     <property name="active">False</property>\r
-                     <signal name="activate" handler="on_show_next_message_activate" last_modification_time="Wed, 03 May 2006 09:44:13 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkCheckMenuItem" id="checkmenuitem9">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Previous message</property>\r
-                     <property name="use_underline">True</property>\r
-                     <property name="active">False</property>\r
-                     <signal name="activate" handler="on_show_previous_message_activate" last_modification_time="Wed, 03 May 2006 09:44:13 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-               </widget>\r
-             </child>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkMenuItem" id="menuitem69">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">_Tools</property>\r
-             <property name="use_underline">True</property>\r
-             <signal name="activate" handler="on_tools1_activate" last_modification_time="Fri, 28 Apr 2006 12:12:02 GMT"/>\r
-\r
-             <child>\r
-               <widget class="GtkMenu" id="menuitem69_menu">\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="add_contact">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Add contact...</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_add_contact_activate" last_modification_time="Wed, 03 May 2006 12:22:42 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkSeparatorMenuItem" id="separatormenuitem18">\r
-                     <property name="visible">True</property>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="font_settings1">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Font settings...</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_font_settings1_activate" last_modification_time="Wed, 03 May 2006 12:22:42 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkSeparatorMenuItem" id="separator17">\r
-                     <property name="visible">True</property>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem71">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Find on page...</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_new_account1_activate" last_modification_time="Fri, 28 Apr 2006 12:23:17 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem72">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Search e-mails...</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_search_e-mails1_activate" last_modification_time="Fri, 28 Apr 2006 12:23:17 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkSeparatorMenuItem" id="separatormenuitem19">\r
-                     <property name="visible">True</property>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem73">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Help</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_help1_activate" last_modification_time="Fri, 28 Apr 2006 12:23:17 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-               </widget>\r
-             </child>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkMenuItem" id="menuitem74">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">_Security</property>\r
-             <property name="use_underline">True</property>\r
-             <signal name="activate" handler="on_security1_activate" last_modification_time="Fri, 28 Apr 2006 13:30:35 GMT"/>\r
-\r
-             <child>\r
-               <widget class="GtkMenu" id="menuitem74_menu">\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="details">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Details</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_details_activate" last_modification_time="Wed, 03 May 2006 12:22:42 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-               </widget>\r
-             </child>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkMenuItem" id="menuitem75">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">_Close</property>\r
-             <property name="use_underline">True</property>\r
-\r
-             <child>\r
-               <widget class="GtkMenu" id="menuitem75_menu">\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem76">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Close window</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_about1_activate" last_modification_time="Fri, 28 Apr 2006 11:10:18 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkMenuItem" id="menuitem77">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Close all windows</property>\r
-                     <property name="use_underline">True</property>\r
-                     <signal name="activate" handler="on_close_all_windows1_activate" last_modification_time="Fri, 28 Apr 2006 12:24:02 GMT"/>\r
-                   </widget>\r
-                 </child>\r
-               </widget>\r
-             </child>\r
-           </widget>\r
-         </child>\r
-       </widget>\r
-       <packing>\r
-         <property name="padding">0</property>\r
-         <property name="expand">False</property>\r
-         <property name="fill">False</property>\r
-       </packing>\r
-      </child>\r
-\r
-      <child>\r
-       <widget class="GtkToolbar" id="toolbar3">\r
-         <property name="visible">True</property>\r
-         <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>\r
-         <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>\r
-         <property name="tooltips">True</property>\r
-         <property name="show_arrow">True</property>\r
-\r
-         <child>\r
-           <widget class="GtkToolButton" id="reply">\r
-             <property name="visible">True</property>\r
-             <property name="tooltip" translatable="yes">Reply</property>\r
-             <property name="label" translatable="yes">Reply</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="icon">qgn_toolb_messagin_reply.png</property>\r
-             <property name="visible_horizontal">True</property>\r
-             <property name="visible_vertical">True</property>\r
-             <property name="is_important">False</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="expand">False</property>\r
-             <property name="homogeneous">True</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkToolButton" id="reply all">\r
-             <property name="visible">True</property>\r
-             <property name="tooltip" translatable="yes">Reply all</property>\r
-             <property name="label" translatable="yes">Reply all</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="icon">qgn_toolb_messagin_replytoall.png</property>\r
-             <property name="visible_horizontal">True</property>\r
-             <property name="visible_vertical">True</property>\r
-             <property name="is_important">False</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="expand">False</property>\r
-             <property name="homogeneous">True</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkToolButton" id="forward">\r
-             <property name="visible">True</property>\r
-             <property name="tooltip" translatable="yes">Forward</property>\r
-             <property name="label" translatable="yes">Forward</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="icon">qgn_toolb_messagin_forward.png</property>\r
-             <property name="visible_horizontal">True</property>\r
-             <property name="visible_vertical">True</property>\r
-             <property name="is_important">False</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="expand">False</property>\r
-             <property name="homogeneous">True</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkToolButton" id="save_attacment">\r
-             <property name="visible">True</property>\r
-             <property name="tooltip" translatable="yes">Save attached files</property>\r
-             <property name="label" translatable="yes">Save Attacments...</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="icon">qgn_toolb_messagin_saveattachment.png</property>\r
-             <property name="visible_horizontal">True</property>\r
-             <property name="visible_vertical">True</property>\r
-             <property name="is_important">False</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="expand">False</property>\r
-             <property name="homogeneous">True</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkToolButton" id="move_to">\r
-             <property name="visible">True</property>\r
-             <property name="tooltip" translatable="yes">Move message to other location</property>\r
-             <property name="label" translatable="yes">Move to...</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="icon">qgn_toolb_messagin_moveto.png</property>\r
-             <property name="visible_horizontal">True</property>\r
-             <property name="visible_vertical">True</property>\r
-             <property name="is_important">False</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="expand">False</property>\r
-             <property name="homogeneous">True</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkToolButton" id="toolbutton12">\r
-             <property name="visible">True</property>\r
-             <property name="tooltip" translatable="yes">View previous message</property>\r
-             <property name="label" translatable="yes">Previous</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="icon">qgn_toolb_messagin_previous.png</property>\r
-             <property name="visible_horizontal">True</property>\r
-             <property name="visible_vertical">True</property>\r
-             <property name="is_important">False</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="expand">False</property>\r
-             <property name="homogeneous">True</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkToolButton" id="toolbutton13">\r
-             <property name="visible">True</property>\r
-             <property name="tooltip" translatable="yes">View next message</property>\r
-             <property name="label" translatable="yes">Next</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="icon">qgn_toolb_messagin_next.png</property>\r
-             <property name="visible_horizontal">True</property>\r
-             <property name="visible_vertical">True</property>\r
-             <property name="is_important">False</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="expand">False</property>\r
-             <property name="homogeneous">True</property>\r
-           </packing>\r
-         </child>\r
-       </widget>\r
-       <packing>\r
-         <property name="padding">0</property>\r
-         <property name="expand">False</property>\r
-         <property name="fill">False</property>\r
-       </packing>\r
-      </child>\r
-\r
-      <child>\r
-       <widget class="GtkVPaned" id="vpaned3">\r
-         <property name="visible">True</property>\r
-         <property name="can_focus">True</property>\r
-         <property name="position">100</property>\r
-\r
-         <child>\r
-           <widget class="GtkTable" id="table2">\r
-             <property name="border_width">10</property>\r
-             <property name="visible">True</property>\r
-             <property name="n_rows">4</property>\r
-             <property name="n_columns">2</property>\r
-             <property name="homogeneous">False</property>\r
-             <property name="row_spacing">10</property>\r
-             <property name="column_spacing">10</property>\r
-\r
-             <child>\r
-               <widget class="GtkLabel" id="label_from">\r
-                 <property name="visible">True</property>\r
-                 <property name="label" translatable="yes">From:</property>\r
-                 <property name="use_underline">False</property>\r
-                 <property name="use_markup">False</property>\r
-                 <property name="justify">GTK_JUSTIFY_RIGHT</property>\r
-                 <property name="wrap">False</property>\r
-                 <property name="selectable">False</property>\r
-                 <property name="xalign">0</property>\r
-                 <property name="yalign">0.5</property>\r
-                 <property name="xpad">0</property>\r
-                 <property name="ypad">0</property>\r
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                 <property name="width_chars">-1</property>\r
-                 <property name="single_line_mode">False</property>\r
-                 <property name="angle">0</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">0</property>\r
-                 <property name="right_attach">1</property>\r
-                 <property name="top_attach">0</property>\r
-                 <property name="bottom_attach">1</property>\r
-                 <property name="x_options">fill</property>\r
-                 <property name="y_options"></property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkLabel" id="label_subject">\r
-                 <property name="visible">True</property>\r
-                 <property name="label" translatable="yes">Subject:</property>\r
-                 <property name="use_underline">False</property>\r
-                 <property name="use_markup">False</property>\r
-                 <property name="justify">GTK_JUSTIFY_RIGHT</property>\r
-                 <property name="wrap">False</property>\r
-                 <property name="selectable">False</property>\r
-                 <property name="xalign">0</property>\r
-                 <property name="yalign">0.5</property>\r
-                 <property name="xpad">0</property>\r
-                 <property name="ypad">0</property>\r
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                 <property name="width_chars">-1</property>\r
-                 <property name="single_line_mode">False</property>\r
-                 <property name="angle">0</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">0</property>\r
-                 <property name="right_attach">1</property>\r
-                 <property name="top_attach">2</property>\r
-                 <property name="bottom_attach">3</property>\r
-                 <property name="x_options">fill</property>\r
-                 <property name="y_options"></property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkLabel" id="label_date">\r
-                 <property name="visible">True</property>\r
-                 <property name="label" translatable="yes">Date:</property>\r
-                 <property name="use_underline">False</property>\r
-                 <property name="use_markup">False</property>\r
-                 <property name="justify">GTK_JUSTIFY_RIGHT</property>\r
-                 <property name="wrap">False</property>\r
-                 <property name="selectable">False</property>\r
-                 <property name="xalign">0</property>\r
-                 <property name="yalign">0.5</property>\r
-                 <property name="xpad">0</property>\r
-                 <property name="ypad">0</property>\r
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                 <property name="width_chars">-1</property>\r
-                 <property name="single_line_mode">False</property>\r
-                 <property name="angle">0</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">0</property>\r
-                 <property name="right_attach">1</property>\r
-                 <property name="top_attach">3</property>\r
-                 <property name="bottom_attach">4</property>\r
-                 <property name="x_options">fill</property>\r
-                 <property name="y_options"></property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkLabel" id="from">\r
-                 <property name="visible">True</property>\r
-                 <property name="label" translatable="yes"></property>\r
-                 <property name="use_underline">False</property>\r
-                 <property name="use_markup">False</property>\r
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-                 <property name="wrap">False</property>\r
-                 <property name="selectable">False</property>\r
-                 <property name="xalign">0</property>\r
-                 <property name="yalign">0.5</property>\r
-                 <property name="xpad">0</property>\r
-                 <property name="ypad">0</property>\r
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                 <property name="width_chars">-1</property>\r
-                 <property name="single_line_mode">False</property>\r
-                 <property name="angle">0</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">1</property>\r
-                 <property name="right_attach">2</property>\r
-                 <property name="top_attach">0</property>\r
-                 <property name="bottom_attach">1</property>\r
-                 <property name="x_options">fill</property>\r
-                 <property name="y_options"></property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkLabel" id="to">\r
-                 <property name="visible">True</property>\r
-                 <property name="label" translatable="yes"></property>\r
-                 <property name="use_underline">False</property>\r
-                 <property name="use_markup">False</property>\r
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-                 <property name="wrap">False</property>\r
-                 <property name="selectable">False</property>\r
-                 <property name="xalign">0</property>\r
-                 <property name="yalign">0.5</property>\r
-                 <property name="xpad">0</property>\r
-                 <property name="ypad">0</property>\r
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                 <property name="width_chars">-1</property>\r
-                 <property name="single_line_mode">False</property>\r
-                 <property name="angle">0</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">1</property>\r
-                 <property name="right_attach">2</property>\r
-                 <property name="top_attach">1</property>\r
-                 <property name="bottom_attach">2</property>\r
-                 <property name="x_options">fill</property>\r
-                 <property name="y_options"></property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkLabel" id="subject">\r
-                 <property name="visible">True</property>\r
-                 <property name="label" translatable="yes"></property>\r
-                 <property name="use_underline">False</property>\r
-                 <property name="use_markup">False</property>\r
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-                 <property name="wrap">False</property>\r
-                 <property name="selectable">False</property>\r
-                 <property name="xalign">0</property>\r
-                 <property name="yalign">0.5</property>\r
-                 <property name="xpad">0</property>\r
-                 <property name="ypad">0</property>\r
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                 <property name="width_chars">-1</property>\r
-                 <property name="single_line_mode">False</property>\r
-                 <property name="angle">0</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">1</property>\r
-                 <property name="right_attach">2</property>\r
-                 <property name="top_attach">2</property>\r
-                 <property name="bottom_attach">3</property>\r
-                 <property name="x_options">fill</property>\r
-                 <property name="y_options"></property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkLabel" id="date">\r
-                 <property name="visible">True</property>\r
-                 <property name="label" translatable="yes"></property>\r
-                 <property name="use_underline">False</property>\r
-                 <property name="use_markup">False</property>\r
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-                 <property name="wrap">False</property>\r
-                 <property name="selectable">False</property>\r
-                 <property name="xalign">0</property>\r
-                 <property name="yalign">0.5</property>\r
-                 <property name="xpad">0</property>\r
-                 <property name="ypad">0</property>\r
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                 <property name="width_chars">-1</property>\r
-                 <property name="single_line_mode">False</property>\r
-                 <property name="angle">0</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">1</property>\r
-                 <property name="right_attach">2</property>\r
-                 <property name="top_attach">3</property>\r
-                 <property name="bottom_attach">4</property>\r
-                 <property name="x_options">fill</property>\r
-                 <property name="y_options"></property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkLabel" id="label_to">\r
-                 <property name="visible">True</property>\r
-                 <property name="label" translatable="yes">To:</property>\r
-                 <property name="use_underline">False</property>\r
-                 <property name="use_markup">False</property>\r
-                 <property name="justify">GTK_JUSTIFY_RIGHT</property>\r
-                 <property name="wrap">False</property>\r
-                 <property name="selectable">False</property>\r
-                 <property name="xalign">0</property>\r
-                 <property name="yalign">0.5</property>\r
-                 <property name="xpad">0</property>\r
-                 <property name="ypad">0</property>\r
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                 <property name="width_chars">-1</property>\r
-                 <property name="single_line_mode">False</property>\r
-                 <property name="angle">0</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">0</property>\r
-                 <property name="right_attach">1</property>\r
-                 <property name="top_attach">1</property>\r
-                 <property name="bottom_attach">2</property>\r
-                 <property name="x_options">fill</property>\r
-                 <property name="y_options"></property>\r
-               </packing>\r
-             </child>\r
-           </widget>\r
-           <packing>\r
-             <property name="shrink">True</property>\r
-             <property name="resize">False</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkScrolledWindow" id="scrolledwindow10">\r
-             <property name="visible">True</property>\r
-             <property name="can_focus">True</property>\r
-             <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>\r
-             <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>\r
-             <property name="shadow_type">GTK_SHADOW_IN</property>\r
-             <property name="window_placement">GTK_CORNER_TOP_LEFT</property>\r
-\r
-             <child>\r
-               <widget class="GtkTextView" id="textview2">\r
-                 <property name="visible">True</property>\r
-                 <property name="can_focus">True</property>\r
-                 <property name="editable">True</property>\r
-                 <property name="overwrite">False</property>\r
-                 <property name="accepts_tab">True</property>\r
-                 <property name="justification">GTK_JUSTIFY_LEFT</property>\r
-                 <property name="wrap_mode">GTK_WRAP_NONE</property>\r
-                 <property name="cursor_visible">True</property>\r
-                 <property name="pixels_above_lines">0</property>\r
-                 <property name="pixels_below_lines">0</property>\r
-                 <property name="pixels_inside_wrap">0</property>\r
-                 <property name="left_margin">0</property>\r
-                 <property name="right_margin">0</property>\r
-                 <property name="indent">0</property>\r
-                 <property name="text" translatable="yes"></property>\r
-               </widget>\r
-             </child>\r
-           </widget>\r
-           <packing>\r
-             <property name="shrink">True</property>\r
-             <property name="resize">True</property>\r
-           </packing>\r
-         </child>\r
-       </widget>\r
-       <packing>\r
-         <property name="padding">0</property>\r
-         <property name="expand">True</property>\r
-         <property name="fill">True</property>\r
-       </packing>\r
-      </child>\r
-    </widget>\r
-  </child>\r
-</widget>\r
-\r
-<widget class="GtkDialog" id="mailbox_setup_1">\r
-  <property name="border_width">10</property>\r
-  <property name="width_request">400</property>\r
-  <property name="height_request">350</property>\r
-  <property name="visible">True</property>\r
-  <property name="title" translatable="yes">Mailbox setup 1/4</property>\r
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>\r
-  <property name="window_position">GTK_WIN_POS_NONE</property>\r
-  <property name="modal">False</property>\r
-  <property name="default_width">500</property>\r
-  <property name="default_height">400</property>\r
-  <property name="resizable">False</property>\r
-  <property name="destroy_with_parent">False</property>\r
-  <property name="decorated">True</property>\r
-  <property name="skip_taskbar_hint">False</property>\r
-  <property name="skip_pager_hint">False</property>\r
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>\r
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>\r
-  <property name="focus_on_map">True</property>\r
-  <property name="urgency_hint">False</property>\r
-  <property name="has_separator">True</property>\r
-\r
-  <child internal-child="vbox">\r
-    <widget class="GtkVBox" id="vbox4">\r
-      <property name="visible">True</property>\r
-      <property name="homogeneous">False</property>\r
-      <property name="spacing">0</property>\r
-\r
-      <child internal-child="action_area">\r
-       <widget class="GtkHButtonBox" id="hbuttonbox1">\r
-         <property name="visible">True</property>\r
-         <property name="layout_style">GTK_BUTTONBOX_END</property>\r
-\r
-         <child>\r
-           <widget class="GtkButton" id="button6">\r
-             <property name="visible">True</property>\r
-             <property name="can_default">True</property>\r
-             <property name="can_focus">True</property>\r
-             <property name="label" translatable="yes">Finish</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="relief">GTK_RELIEF_NORMAL</property>\r
-             <property name="focus_on_click">True</property>\r
-             <property name="response_id">0</property>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkButton" id="button7">\r
-             <property name="visible">True</property>\r
-             <property name="can_default">True</property>\r
-             <property name="can_focus">True</property>\r
-             <property name="label" translatable="yes">Back</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="relief">GTK_RELIEF_NORMAL</property>\r
-             <property name="focus_on_click">True</property>\r
-             <property name="response_id">0</property>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkButton" id="button8">\r
-             <property name="visible">True</property>\r
-             <property name="can_default">True</property>\r
-             <property name="can_focus">True</property>\r
-             <property name="label" translatable="yes">Next</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="relief">GTK_RELIEF_NORMAL</property>\r
-             <property name="focus_on_click">True</property>\r
-             <property name="response_id">0</property>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkButton" id="button9">\r
-             <property name="visible">True</property>\r
-             <property name="can_default">True</property>\r
-             <property name="can_focus">True</property>\r
-             <property name="label" translatable="yes">Cancel</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="relief">GTK_RELIEF_NORMAL</property>\r
-             <property name="focus_on_click">True</property>\r
-             <property name="response_id">0</property>\r
-           </widget>\r
-         </child>\r
-       </widget>\r
-       <packing>\r
-         <property name="padding">0</property>\r
-         <property name="expand">False</property>\r
-         <property name="fill">True</property>\r
-         <property name="pack_type">GTK_PACK_END</property>\r
-       </packing>\r
-      </child>\r
-\r
-      <child>\r
-       <widget class="GtkVBox" id="vbox5">\r
-         <property name="visible">True</property>\r
-         <property name="homogeneous">False</property>\r
-         <property name="spacing">10</property>\r
-\r
-         <child>\r
-           <widget class="GtkHBox" id="hbox17">\r
-             <property name="visible">True</property>\r
-             <property name="homogeneous">False</property>\r
-             <property name="spacing">0</property>\r
-\r
-             <child>\r
-               <widget class="GtkLabel" id="label53">\r
-                 <property name="visible">True</property>\r
-                 <property name="label" translatable="yes">Mailbox setup wizard allows you to define mailboxes for use on your device.</property>\r
-                 <property name="use_underline">False</property>\r
-                 <property name="use_markup">False</property>\r
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-                 <property name="wrap">False</property>\r
-                 <property name="selectable">False</property>\r
-                 <property name="xalign">0.5</property>\r
-                 <property name="yalign">0.5</property>\r
-                 <property name="xpad">0</property>\r
-                 <property name="ypad">10</property>\r
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                 <property name="width_chars">-1</property>\r
-                 <property name="single_line_mode">False</property>\r
-                 <property name="angle">0</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="padding">0</property>\r
-                 <property name="expand">False</property>\r
-                 <property name="fill">False</property>\r
-               </packing>\r
-             </child>\r
-           </widget>\r
-           <packing>\r
-             <property name="padding">0</property>\r
-             <property name="expand">False</property>\r
-             <property name="fill">False</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkHSeparator" id="hseparator6">\r
-             <property name="visible">True</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="padding">0</property>\r
-             <property name="expand">False</property>\r
-             <property name="fill">True</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkTable" id="table3">\r
-             <property name="visible">True</property>\r
-             <property name="n_rows">2</property>\r
-             <property name="n_columns">2</property>\r
-             <property name="homogeneous">False</property>\r
-             <property name="row_spacing">10</property>\r
-             <property name="column_spacing">10</property>\r
-\r
-             <child>\r
-               <widget class="GtkLabel" id="label14">\r
-                 <property name="visible">True</property>\r
-                 <property name="label" translatable="yes">Mailbox name:</property>\r
-                 <property name="use_underline">False</property>\r
-                 <property name="use_markup">False</property>\r
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-                 <property name="wrap">False</property>\r
-                 <property name="selectable">False</property>\r
-                 <property name="xalign">0</property>\r
-                 <property name="yalign">0.5</property>\r
-                 <property name="xpad">0</property>\r
-                 <property name="ypad">0</property>\r
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                 <property name="width_chars">-1</property>\r
-                 <property name="single_line_mode">False</property>\r
-                 <property name="angle">0</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">0</property>\r
-                 <property name="right_attach">1</property>\r
-                 <property name="top_attach">0</property>\r
-                 <property name="bottom_attach">1</property>\r
-                 <property name="x_options">fill</property>\r
-                 <property name="y_options"></property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkLabel" id="label15">\r
-                 <property name="visible">True</property>\r
-                 <property name="label" translatable="yes">Mailbox type:</property>\r
-                 <property name="use_underline">False</property>\r
-                 <property name="use_markup">False</property>\r
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-                 <property name="wrap">False</property>\r
-                 <property name="selectable">False</property>\r
-                 <property name="xalign">0</property>\r
-                 <property name="yalign">0.5</property>\r
-                 <property name="xpad">0</property>\r
-                 <property name="ypad">0</property>\r
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                 <property name="width_chars">-1</property>\r
-                 <property name="single_line_mode">False</property>\r
-                 <property name="angle">0</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">0</property>\r
-                 <property name="right_attach">1</property>\r
-                 <property name="top_attach">1</property>\r
-                 <property name="bottom_attach">2</property>\r
-                 <property name="x_options">fill</property>\r
-                 <property name="y_options"></property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkEntry" id="entry4">\r
-                 <property name="visible">True</property>\r
-                 <property name="can_focus">True</property>\r
-                 <property name="editable">True</property>\r
-                 <property name="visibility">True</property>\r
-                 <property name="max_length">0</property>\r
-                 <property name="text" translatable="yes"></property>\r
-                 <property name="has_frame">True</property>\r
-                 <property name="invisible_char">*</property>\r
-                 <property name="activates_default">False</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">1</property>\r
-                 <property name="right_attach">2</property>\r
-                 <property name="top_attach">0</property>\r
-                 <property name="bottom_attach">1</property>\r
-                 <property name="y_options"></property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkComboBoxEntry" id="comboboxentry1">\r
-                 <property name="visible">True</property>\r
-                 <property name="add_tearoffs">False</property>\r
-                 <property name="has_frame">True</property>\r
-                 <property name="focus_on_click">True</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">1</property>\r
-                 <property name="right_attach">2</property>\r
-                 <property name="top_attach">1</property>\r
-                 <property name="bottom_attach">2</property>\r
-                 <property name="x_options">fill</property>\r
-                 <property name="y_options">fill</property>\r
-               </packing>\r
-             </child>\r
-           </widget>\r
-           <packing>\r
-             <property name="padding">0</property>\r
-             <property name="expand">False</property>\r
-             <property name="fill">True</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkHBox" id="hbox18">\r
-             <property name="visible">True</property>\r
-             <property name="homogeneous">False</property>\r
-             <property name="spacing">0</property>\r
-\r
-             <child>\r
-               <widget class="GtkLabel" id="label13">\r
-                 <property name="visible">True</property>\r
-                 <property name="label" translatable="yes">! Note: You cannot edit mailbox type once setup is complete</property>\r
-                 <property name="use_underline">False</property>\r
-                 <property name="use_markup">False</property>\r
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-                 <property name="wrap">False</property>\r
-                 <property name="selectable">False</property>\r
-                 <property name="xalign">0.5</property>\r
-                 <property name="yalign">0.5</property>\r
-                 <property name="xpad">0</property>\r
-                 <property name="ypad">10</property>\r
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                 <property name="width_chars">-1</property>\r
-                 <property name="single_line_mode">False</property>\r
-                 <property name="angle">0</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="padding">0</property>\r
-                 <property name="expand">False</property>\r
-                 <property name="fill">False</property>\r
-               </packing>\r
-             </child>\r
-           </widget>\r
-           <packing>\r
-             <property name="padding">0</property>\r
-             <property name="expand">False</property>\r
-             <property name="fill">False</property>\r
-           </packing>\r
-         </child>\r
-       </widget>\r
-       <packing>\r
-         <property name="padding">0</property>\r
-         <property name="expand">True</property>\r
-         <property name="fill">True</property>\r
-       </packing>\r
-      </child>\r
-    </widget>\r
-  </child>\r
-</widget>\r
-\r
-<widget class="GtkDialog" id="mailbox_setup_2">\r
-  <property name="border_width">10</property>\r
-  <property name="width_request">400</property>\r
-  <property name="height_request">350</property>\r
-  <property name="visible">True</property>\r
-  <property name="title" translatable="yes">Mailbox setup 2/4</property>\r
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>\r
-  <property name="window_position">GTK_WIN_POS_NONE</property>\r
-  <property name="modal">False</property>\r
-  <property name="default_width">500</property>\r
-  <property name="default_height">400</property>\r
-  <property name="resizable">False</property>\r
-  <property name="destroy_with_parent">False</property>\r
-  <property name="decorated">True</property>\r
-  <property name="skip_taskbar_hint">False</property>\r
-  <property name="skip_pager_hint">False</property>\r
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>\r
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>\r
-  <property name="focus_on_map">True</property>\r
-  <property name="urgency_hint">False</property>\r
-  <property name="has_separator">True</property>\r
-\r
-  <child internal-child="vbox">\r
-    <widget class="GtkVBox" id="vbox6">\r
-      <property name="visible">True</property>\r
-      <property name="homogeneous">False</property>\r
-      <property name="spacing">0</property>\r
-\r
-      <child internal-child="action_area">\r
-       <widget class="GtkHButtonBox" id="hbuttonbox2">\r
-         <property name="visible">True</property>\r
-         <property name="layout_style">GTK_BUTTONBOX_END</property>\r
-\r
-         <child>\r
-           <widget class="GtkButton" id="button11">\r
-             <property name="visible">True</property>\r
-             <property name="can_default">True</property>\r
-             <property name="can_focus">True</property>\r
-             <property name="label" translatable="yes">Finish</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="relief">GTK_RELIEF_NORMAL</property>\r
-             <property name="focus_on_click">True</property>\r
-             <property name="response_id">0</property>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkButton" id="button12">\r
-             <property name="visible">True</property>\r
-             <property name="can_default">True</property>\r
-             <property name="can_focus">True</property>\r
-             <property name="label" translatable="yes">Back</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="relief">GTK_RELIEF_NORMAL</property>\r
-             <property name="focus_on_click">True</property>\r
-             <property name="response_id">0</property>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkButton" id="button13">\r
-             <property name="visible">True</property>\r
-             <property name="can_default">True</property>\r
-             <property name="can_focus">True</property>\r
-             <property name="label" translatable="yes">Next</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="relief">GTK_RELIEF_NORMAL</property>\r
-             <property name="focus_on_click">True</property>\r
-             <property name="response_id">0</property>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkButton" id="button14">\r
-             <property name="visible">True</property>\r
-             <property name="can_default">True</property>\r
-             <property name="can_focus">True</property>\r
-             <property name="label" translatable="yes">Cancel</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="relief">GTK_RELIEF_NORMAL</property>\r
-             <property name="focus_on_click">True</property>\r
-             <property name="response_id">0</property>\r
-           </widget>\r
-         </child>\r
-       </widget>\r
-       <packing>\r
-         <property name="padding">0</property>\r
-         <property name="expand">False</property>\r
-         <property name="fill">True</property>\r
-         <property name="pack_type">GTK_PACK_END</property>\r
-       </packing>\r
-      </child>\r
-\r
-      <child>\r
-       <widget class="GtkTable" id="table4">\r
-         <property name="visible">True</property>\r
-         <property name="n_rows">4</property>\r
-         <property name="n_columns">2</property>\r
-         <property name="homogeneous">False</property>\r
-         <property name="row_spacing">10</property>\r
-         <property name="column_spacing">0</property>\r
-\r
-         <child>\r
-           <widget class="GtkLabel" id="label16">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">Name:</property>\r
-             <property name="use_underline">False</property>\r
-             <property name="use_markup">False</property>\r
-             <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-             <property name="wrap">False</property>\r
-             <property name="selectable">False</property>\r
-             <property name="xalign">0</property>\r
-             <property name="yalign">0.5</property>\r
-             <property name="xpad">0</property>\r
-             <property name="ypad">0</property>\r
-             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-             <property name="width_chars">-1</property>\r
-             <property name="single_line_mode">False</property>\r
-             <property name="angle">0</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="left_attach">0</property>\r
-             <property name="right_attach">1</property>\r
-             <property name="top_attach">0</property>\r
-             <property name="bottom_attach">1</property>\r
-             <property name="x_options">fill</property>\r
-             <property name="y_options"></property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkLabel" id="label17">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">User name:</property>\r
-             <property name="use_underline">False</property>\r
-             <property name="use_markup">False</property>\r
-             <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-             <property name="wrap">False</property>\r
-             <property name="selectable">False</property>\r
-             <property name="xalign">0</property>\r
-             <property name="yalign">0.5</property>\r
-             <property name="xpad">0</property>\r
-             <property name="ypad">0</property>\r
-             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-             <property name="width_chars">-1</property>\r
-             <property name="single_line_mode">False</property>\r
-             <property name="angle">0</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="left_attach">0</property>\r
-             <property name="right_attach">1</property>\r
-             <property name="top_attach">1</property>\r
-             <property name="bottom_attach">2</property>\r
-             <property name="x_options">fill</property>\r
-             <property name="y_options"></property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkEntry" id="entry5">\r
-             <property name="visible">True</property>\r
-             <property name="can_focus">True</property>\r
-             <property name="editable">True</property>\r
-             <property name="visibility">True</property>\r
-             <property name="max_length">0</property>\r
-             <property name="text" translatable="yes"></property>\r
-             <property name="has_frame">True</property>\r
-             <property name="invisible_char">*</property>\r
-             <property name="activates_default">False</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="left_attach">1</property>\r
-             <property name="right_attach">2</property>\r
-             <property name="top_attach">0</property>\r
-             <property name="bottom_attach">1</property>\r
-             <property name="y_options"></property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkComboBoxEntry" id="comboboxentry2">\r
-             <property name="visible">True</property>\r
-             <property name="add_tearoffs">False</property>\r
-             <property name="has_frame">True</property>\r
-             <property name="focus_on_click">True</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="left_attach">1</property>\r
-             <property name="right_attach">2</property>\r
-             <property name="top_attach">1</property>\r
-             <property name="bottom_attach">2</property>\r
-             <property name="x_options">fill</property>\r
-             <property name="y_options">fill</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkLabel" id="label19">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">Password:</property>\r
-             <property name="use_underline">False</property>\r
-             <property name="use_markup">False</property>\r
-             <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-             <property name="wrap">False</property>\r
-             <property name="selectable">False</property>\r
-             <property name="xalign">0</property>\r
-             <property name="yalign">0.5</property>\r
-             <property name="xpad">0</property>\r
-             <property name="ypad">0</property>\r
-             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-             <property name="width_chars">-1</property>\r
-             <property name="single_line_mode">False</property>\r
-             <property name="angle">0</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="left_attach">0</property>\r
-             <property name="right_attach">1</property>\r
-             <property name="top_attach">2</property>\r
-             <property name="bottom_attach">3</property>\r
-             <property name="x_options">fill</property>\r
-             <property name="y_options"></property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkLabel" id="label20">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">E-mail address:</property>\r
-             <property name="use_underline">False</property>\r
-             <property name="use_markup">False</property>\r
-             <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-             <property name="wrap">False</property>\r
-             <property name="selectable">False</property>\r
-             <property name="xalign">0</property>\r
-             <property name="yalign">0.5</property>\r
-             <property name="xpad">0</property>\r
-             <property name="ypad">0</property>\r
-             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-             <property name="width_chars">-1</property>\r
-             <property name="single_line_mode">False</property>\r
-             <property name="angle">0</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="left_attach">0</property>\r
-             <property name="right_attach">1</property>\r
-             <property name="top_attach">3</property>\r
-             <property name="bottom_attach">4</property>\r
-             <property name="x_options">fill</property>\r
-             <property name="y_options"></property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkEntry" id="entry6">\r
-             <property name="visible">True</property>\r
-             <property name="can_focus">True</property>\r
-             <property name="editable">True</property>\r
-             <property name="visibility">False</property>\r
-             <property name="max_length">0</property>\r
-             <property name="text" translatable="yes"></property>\r
-             <property name="has_frame">True</property>\r
-             <property name="invisible_char">*</property>\r
-             <property name="activates_default">False</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="left_attach">1</property>\r
-             <property name="right_attach">2</property>\r
-             <property name="top_attach">2</property>\r
-             <property name="bottom_attach">3</property>\r
-             <property name="y_options"></property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkEntry" id="entry7">\r
-             <property name="visible">True</property>\r
-             <property name="can_focus">True</property>\r
-             <property name="editable">True</property>\r
-             <property name="visibility">True</property>\r
-             <property name="max_length">0</property>\r
-             <property name="text" translatable="yes"></property>\r
-             <property name="has_frame">True</property>\r
-             <property name="invisible_char">*</property>\r
-             <property name="activates_default">False</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="left_attach">1</property>\r
-             <property name="right_attach">2</property>\r
-             <property name="top_attach">3</property>\r
-             <property name="bottom_attach">4</property>\r
-             <property name="y_options"></property>\r
-           </packing>\r
-         </child>\r
-       </widget>\r
-       <packing>\r
-         <property name="padding">0</property>\r
-         <property name="expand">True</property>\r
-         <property name="fill">True</property>\r
-       </packing>\r
-      </child>\r
-    </widget>\r
-  </child>\r
-</widget>\r
-\r
-<widget class="GtkDialog" id="mailbox_setup_advanced">\r
-  <property name="border_width">10</property>\r
-  <property name="width_request">400</property>\r
-  <property name="height_request">350</property>\r
-  <property name="visible">True</property>\r
-  <property name="title" translatable="yes">Advanced E-mail settings</property>\r
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>\r
-  <property name="window_position">GTK_WIN_POS_NONE</property>\r
-  <property name="modal">False</property>\r
-  <property name="default_width">500</property>\r
-  <property name="default_height">400</property>\r
-  <property name="resizable">False</property>\r
-  <property name="destroy_with_parent">False</property>\r
-  <property name="decorated">True</property>\r
-  <property name="skip_taskbar_hint">False</property>\r
-  <property name="skip_pager_hint">False</property>\r
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>\r
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>\r
-  <property name="focus_on_map">True</property>\r
-  <property name="urgency_hint">False</property>\r
-  <property name="has_separator">True</property>\r
-\r
-  <child internal-child="vbox">\r
-    <widget class="GtkVBox" id="vbox7">\r
-      <property name="visible">True</property>\r
-      <property name="homogeneous">False</property>\r
-      <property name="spacing">0</property>\r
-\r
-      <child internal-child="action_area">\r
-       <widget class="GtkHButtonBox" id="hbuttonbox3">\r
-         <property name="visible">True</property>\r
-         <property name="layout_style">GTK_BUTTONBOX_END</property>\r
-\r
-         <child>\r
-           <widget class="GtkButton" id="button16">\r
-             <property name="visible">True</property>\r
-             <property name="can_default">True</property>\r
-             <property name="can_focus">True</property>\r
-             <property name="label" translatable="yes">Ok</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="relief">GTK_RELIEF_NORMAL</property>\r
-             <property name="focus_on_click">True</property>\r
-             <property name="response_id">0</property>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkButton" id="button17">\r
-             <property name="visible">True</property>\r
-             <property name="can_default">True</property>\r
-             <property name="can_focus">True</property>\r
-             <property name="label" translatable="yes">Cancel</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="relief">GTK_RELIEF_NORMAL</property>\r
-             <property name="focus_on_click">True</property>\r
-             <property name="response_id">0</property>\r
-           </widget>\r
-         </child>\r
-       </widget>\r
-       <packing>\r
-         <property name="padding">0</property>\r
-         <property name="expand">False</property>\r
-         <property name="fill">True</property>\r
-         <property name="pack_type">GTK_PACK_END</property>\r
-       </packing>\r
-      </child>\r
-\r
-      <child>\r
-       <widget class="GtkNotebook" id="notebook1">\r
-         <property name="visible">True</property>\r
-         <property name="can_focus">True</property>\r
-         <property name="show_tabs">True</property>\r
-         <property name="show_border">True</property>\r
-         <property name="tab_pos">GTK_POS_TOP</property>\r
-         <property name="scrollable">False</property>\r
-         <property name="enable_popup">False</property>\r
-\r
-         <child>\r
-           <widget class="GtkTable" id="table7">\r
-             <property name="border_width">10</property>\r
-             <property name="visible">True</property>\r
-             <property name="n_rows">4</property>\r
-             <property name="n_columns">2</property>\r
-             <property name="homogeneous">False</property>\r
-             <property name="row_spacing">10</property>\r
-             <property name="column_spacing">10</property>\r
-\r
-             <child>\r
-               <widget class="GtkLabel" id="label48">\r
-                 <property name="visible">True</property>\r
-                 <property name="label" translatable="yes">Retrieve:</property>\r
-                 <property name="use_underline">False</property>\r
-                 <property name="use_markup">False</property>\r
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-                 <property name="wrap">False</property>\r
-                 <property name="selectable">False</property>\r
-                 <property name="xalign">0</property>\r
-                 <property name="yalign">0.5</property>\r
-                 <property name="xpad">0</property>\r
-                 <property name="ypad">0</property>\r
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                 <property name="width_chars">-1</property>\r
-                 <property name="single_line_mode">False</property>\r
-                 <property name="angle">0</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">0</property>\r
-                 <property name="right_attach">1</property>\r
-                 <property name="top_attach">0</property>\r
-                 <property name="bottom_attach">1</property>\r
-                 <property name="x_options">fill</property>\r
-                 <property name="y_options"></property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkLabel" id="label51">\r
-                 <property name="visible">True</property>\r
-                 <property name="label" translatable="yes">Password authentication</property>\r
-                 <property name="use_underline">False</property>\r
-                 <property name="use_markup">False</property>\r
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-                 <property name="wrap">False</property>\r
-                 <property name="selectable">False</property>\r
-                 <property name="xalign">0</property>\r
-                 <property name="yalign">0.5</property>\r
-                 <property name="xpad">0</property>\r
-                 <property name="ypad">0</property>\r
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                 <property name="width_chars">-1</property>\r
-                 <property name="single_line_mode">False</property>\r
-                 <property name="angle">0</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">0</property>\r
-                 <property name="right_attach">1</property>\r
-                 <property name="top_attach">3</property>\r
-                 <property name="bottom_attach">4</property>\r
-                 <property name="x_options">fill</property>\r
-                 <property name="y_options"></property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkLabel" id="label49">\r
-                 <property name="visible">True</property>\r
-                 <property name="label" translatable="yes">No of e-mails to retrieve</property>\r
-                 <property name="use_underline">False</property>\r
-                 <property name="use_markup">False</property>\r
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-                 <property name="wrap">False</property>\r
-                 <property name="selectable">False</property>\r
-                 <property name="xalign">0</property>\r
-                 <property name="yalign">0.5</property>\r
-                 <property name="xpad">0</property>\r
-                 <property name="ypad">0</property>\r
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                 <property name="width_chars">-1</property>\r
-                 <property name="single_line_mode">False</property>\r
-                 <property name="angle">0</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">0</property>\r
-                 <property name="right_attach">1</property>\r
-                 <property name="top_attach">2</property>\r
-                 <property name="bottom_attach">3</property>\r
-                 <property name="x_options">fill</property>\r
-                 <property name="y_options"></property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkLabel" id="label52">\r
-                 <property name="visible">True</property>\r
-                 <property name="label" translatable="yes">E-mail size limit:</property>\r
-                 <property name="use_underline">False</property>\r
-                 <property name="use_markup">False</property>\r
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-                 <property name="wrap">False</property>\r
-                 <property name="selectable">False</property>\r
-                 <property name="xalign">0</property>\r
-                 <property name="yalign">0.5</property>\r
-                 <property name="xpad">0</property>\r
-                 <property name="ypad">0</property>\r
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                 <property name="width_chars">-1</property>\r
-                 <property name="single_line_mode">False</property>\r
-                 <property name="angle">0</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">0</property>\r
-                 <property name="right_attach">1</property>\r
-                 <property name="top_attach">1</property>\r
-                 <property name="bottom_attach">2</property>\r
-                 <property name="x_options">fill</property>\r
-                 <property name="y_options"></property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkComboBox" id="combobox8">\r
-                 <property name="visible">True</property>\r
-                 <property name="add_tearoffs">False</property>\r
-                 <property name="focus_on_click">True</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">1</property>\r
-                 <property name="right_attach">2</property>\r
-                 <property name="top_attach">0</property>\r
-                 <property name="bottom_attach">1</property>\r
-                 <property name="y_options">fill</property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkComboBox" id="combobox9">\r
-                 <property name="visible">True</property>\r
-                 <property name="add_tearoffs">False</property>\r
-                 <property name="focus_on_click">True</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">1</property>\r
-                 <property name="right_attach">2</property>\r
-                 <property name="top_attach">2</property>\r
-                 <property name="bottom_attach">3</property>\r
-                 <property name="x_options">fill</property>\r
-                 <property name="y_options">fill</property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkComboBox" id="combobox10">\r
-                 <property name="visible">True</property>\r
-                 <property name="add_tearoffs">False</property>\r
-                 <property name="focus_on_click">True</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">1</property>\r
-                 <property name="right_attach">2</property>\r
-                 <property name="top_attach">3</property>\r
-                 <property name="bottom_attach">4</property>\r
-                 <property name="x_options">fill</property>\r
-                 <property name="y_options">fill</property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkHBox" id="hbox16">\r
-                 <property name="visible">True</property>\r
-                 <property name="homogeneous">False</property>\r
-                 <property name="spacing">10</property>\r
-\r
-                 <child>\r
-                   <widget class="GtkSpinButton" id="spinbutton4">\r
-                     <property name="visible">True</property>\r
-                     <property name="can_focus">True</property>\r
-                     <property name="climb_rate">1</property>\r
-                     <property name="digits">0</property>\r
-                     <property name="numeric">False</property>\r
-                     <property name="update_policy">GTK_UPDATE_ALWAYS</property>\r
-                     <property name="snap_to_ticks">False</property>\r
-                     <property name="wrap">False</property>\r
-                     <property name="adjustment">1 0 100 1 10 10</property>\r
-                   </widget>\r
-                   <packing>\r
-                     <property name="padding">0</property>\r
-                     <property name="expand">False</property>\r
-                     <property name="fill">False</property>\r
-                   </packing>\r
-                 </child>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">1</property>\r
-                 <property name="right_attach">2</property>\r
-                 <property name="top_attach">1</property>\r
-                 <property name="bottom_attach">2</property>\r
-                 <property name="x_options">fill</property>\r
-                 <property name="y_options"></property>\r
-               </packing>\r
-             </child>\r
-           </widget>\r
-           <packing>\r
-             <property name="tab_expand">False</property>\r
-             <property name="tab_fill">True</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkLabel" id="label23">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">Retrieval</property>\r
-             <property name="use_underline">False</property>\r
-             <property name="use_markup">False</property>\r
-             <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-             <property name="wrap">False</property>\r
-             <property name="selectable">False</property>\r
-             <property name="xalign">0.5</property>\r
-             <property name="yalign">0.5</property>\r
-             <property name="xpad">0</property>\r
-             <property name="ypad">0</property>\r
-             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-             <property name="width_chars">-1</property>\r
-             <property name="single_line_mode">False</property>\r
-             <property name="angle">0</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="type">tab</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkVBox" id="vbox10">\r
-             <property name="border_width">10</property>\r
-             <property name="visible">True</property>\r
-             <property name="homogeneous">False</property>\r
-             <property name="spacing">10</property>\r
-\r
-             <child>\r
-               <widget class="GtkTable" id="table6">\r
-                 <property name="border_width">10</property>\r
-                 <property name="visible">True</property>\r
-                 <property name="n_rows">2</property>\r
-                 <property name="n_columns">2</property>\r
-                 <property name="homogeneous">False</property>\r
-                 <property name="row_spacing">10</property>\r
-                 <property name="column_spacing">10</property>\r
-\r
-                 <child>\r
-                   <widget class="GtkLabel" id="label46">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Default e-mail format:</property>\r
-                     <property name="use_underline">False</property>\r
-                     <property name="use_markup">False</property>\r
-                     <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-                     <property name="wrap">False</property>\r
-                     <property name="selectable">False</property>\r
-                     <property name="xalign">0</property>\r
-                     <property name="yalign">0.5</property>\r
-                     <property name="xpad">0</property>\r
-                     <property name="ypad">0</property>\r
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                     <property name="width_chars">-1</property>\r
-                     <property name="single_line_mode">False</property>\r
-                     <property name="angle">0</property>\r
-                   </widget>\r
-                   <packing>\r
-                     <property name="left_attach">0</property>\r
-                     <property name="right_attach">1</property>\r
-                     <property name="top_attach">0</property>\r
-                     <property name="bottom_attach">1</property>\r
-                     <property name="x_options">fill</property>\r
-                     <property name="y_options"></property>\r
-                   </packing>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkLabel" id="label47">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Sending e-mail:</property>\r
-                     <property name="use_underline">False</property>\r
-                     <property name="use_markup">False</property>\r
-                     <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-                     <property name="wrap">False</property>\r
-                     <property name="selectable">False</property>\r
-                     <property name="xalign">0</property>\r
-                     <property name="yalign">0.5</property>\r
-                     <property name="xpad">0</property>\r
-                     <property name="ypad">0</property>\r
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                     <property name="width_chars">-1</property>\r
-                     <property name="single_line_mode">False</property>\r
-                     <property name="angle">0</property>\r
-                   </widget>\r
-                   <packing>\r
-                     <property name="left_attach">0</property>\r
-                     <property name="right_attach">1</property>\r
-                     <property name="top_attach">1</property>\r
-                     <property name="bottom_attach">2</property>\r
-                     <property name="x_options">fill</property>\r
-                     <property name="y_options"></property>\r
-                   </packing>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkComboBox" id="combobox6">\r
-                     <property name="visible">True</property>\r
-                     <property name="add_tearoffs">False</property>\r
-                     <property name="focus_on_click">True</property>\r
-                   </widget>\r
-                   <packing>\r
-                     <property name="left_attach">1</property>\r
-                     <property name="right_attach">2</property>\r
-                     <property name="top_attach">0</property>\r
-                     <property name="bottom_attach">1</property>\r
-                     <property name="y_options">fill</property>\r
-                   </packing>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkComboBox" id="combobox7">\r
-                     <property name="visible">True</property>\r
-                     <property name="add_tearoffs">False</property>\r
-                     <property name="focus_on_click">True</property>\r
-                   </widget>\r
-                   <packing>\r
-                     <property name="left_attach">1</property>\r
-                     <property name="right_attach">2</property>\r
-                     <property name="top_attach">1</property>\r
-                     <property name="bottom_attach">2</property>\r
-                     <property name="x_options">fill</property>\r
-                     <property name="y_options">fill</property>\r
-                   </packing>\r
-                 </child>\r
-               </widget>\r
-               <packing>\r
-                 <property name="padding">0</property>\r
-                 <property name="expand">False</property>\r
-                 <property name="fill">True</property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkCheckButton" id="checkbutton12">\r
-                 <property name="visible">True</property>\r
-                 <property name="can_focus">True</property>\r
-                 <property name="label" translatable="yes">Include original in reply</property>\r
-                 <property name="use_underline">True</property>\r
-                 <property name="relief">GTK_RELIEF_NORMAL</property>\r
-                 <property name="focus_on_click">True</property>\r
-                 <property name="active">False</property>\r
-                 <property name="inconsistent">False</property>\r
-                 <property name="draw_indicator">True</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="padding">0</property>\r
-                 <property name="expand">False</property>\r
-                 <property name="fill">False</property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkCheckButton" id="checkbutton13">\r
-                 <property name="visible">True</property>\r
-                 <property name="can_focus">True</property>\r
-                 <property name="label" translatable="yes">Request read report</property>\r
-                 <property name="use_underline">True</property>\r
-                 <property name="relief">GTK_RELIEF_NORMAL</property>\r
-                 <property name="focus_on_click">True</property>\r
-                 <property name="active">False</property>\r
-                 <property name="inconsistent">False</property>\r
-                 <property name="draw_indicator">True</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="padding">0</property>\r
-                 <property name="expand">False</property>\r
-                 <property name="fill">False</property>\r
-               </packing>\r
-             </child>\r
-           </widget>\r
-           <packing>\r
-             <property name="tab_expand">False</property>\r
-             <property name="tab_fill">True</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkLabel" id="label24">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">Sending</property>\r
-             <property name="use_underline">False</property>\r
-             <property name="use_markup">False</property>\r
-             <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-             <property name="wrap">False</property>\r
-             <property name="selectable">False</property>\r
-             <property name="xalign">0.5</property>\r
-             <property name="yalign">0.5</property>\r
-             <property name="xpad">0</property>\r
-             <property name="ypad">0</property>\r
-             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-             <property name="width_chars">-1</property>\r
-             <property name="single_line_mode">False</property>\r
-             <property name="angle">0</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="type">tab</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkTable" id="table5">\r
-             <property name="border_width">10</property>\r
-             <property name="visible">True</property>\r
-             <property name="n_rows">3</property>\r
-             <property name="n_columns">2</property>\r
-             <property name="homogeneous">False</property>\r
-             <property name="row_spacing">10</property>\r
-             <property name="column_spacing">10</property>\r
-\r
-             <child>\r
-               <widget class="GtkComboBox" id="combobox5">\r
-                 <property name="visible">True</property>\r
-                 <property name="add_tearoffs">False</property>\r
-                 <property name="focus_on_click">True</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">1</property>\r
-                 <property name="right_attach">2</property>\r
-                 <property name="top_attach">0</property>\r
-                 <property name="bottom_attach">1</property>\r
-                 <property name="y_options">fill</property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkEntry" id="entry9">\r
-                 <property name="visible">True</property>\r
-                 <property name="can_focus">True</property>\r
-                 <property name="editable">True</property>\r
-                 <property name="visibility">True</property>\r
-                 <property name="max_length">0</property>\r
-                 <property name="text" translatable="yes"></property>\r
-                 <property name="has_frame">True</property>\r
-                 <property name="invisible_char">*</property>\r
-                 <property name="activates_default">False</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">1</property>\r
-                 <property name="right_attach">2</property>\r
-                 <property name="top_attach">1</property>\r
-                 <property name="bottom_attach">2</property>\r
-                 <property name="y_options"></property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkEntry" id="entry10">\r
-                 <property name="visible">True</property>\r
-                 <property name="can_focus">True</property>\r
-                 <property name="editable">True</property>\r
-                 <property name="visibility">True</property>\r
-                 <property name="max_length">0</property>\r
-                 <property name="text" translatable="yes"></property>\r
-                 <property name="has_frame">True</property>\r
-                 <property name="invisible_char">*</property>\r
-                 <property name="activates_default">False</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">1</property>\r
-                 <property name="right_attach">2</property>\r
-                 <property name="top_attach">2</property>\r
-                 <property name="bottom_attach">3</property>\r
-                 <property name="y_options"></property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkLabel" id="label45">\r
-                 <property name="visible">True</property>\r
-                 <property name="label" translatable="yes">Password:</property>\r
-                 <property name="use_underline">False</property>\r
-                 <property name="use_markup">False</property>\r
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-                 <property name="wrap">False</property>\r
-                 <property name="selectable">False</property>\r
-                 <property name="xalign">0.5</property>\r
-                 <property name="yalign">0.5</property>\r
-                 <property name="xpad">0</property>\r
-                 <property name="ypad">0</property>\r
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                 <property name="width_chars">-1</property>\r
-                 <property name="single_line_mode">False</property>\r
-                 <property name="angle">0</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">0</property>\r
-                 <property name="right_attach">1</property>\r
-                 <property name="top_attach">2</property>\r
-                 <property name="bottom_attach">3</property>\r
-                 <property name="x_options"></property>\r
-                 <property name="y_options"></property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkLabel" id="label44">\r
-                 <property name="visible">True</property>\r
-                 <property name="label" translatable="yes">Username:</property>\r
-                 <property name="use_underline">False</property>\r
-                 <property name="use_markup">False</property>\r
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-                 <property name="wrap">False</property>\r
-                 <property name="selectable">False</property>\r
-                 <property name="xalign">0.5</property>\r
-                 <property name="yalign">0.5</property>\r
-                 <property name="xpad">0</property>\r
-                 <property name="ypad">0</property>\r
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                 <property name="width_chars">-1</property>\r
-                 <property name="single_line_mode">False</property>\r
-                 <property name="angle">0</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">0</property>\r
-                 <property name="right_attach">1</property>\r
-                 <property name="top_attach">1</property>\r
-                 <property name="bottom_attach">2</property>\r
-                 <property name="x_options"></property>\r
-                 <property name="y_options"></property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkLabel" id="label40">\r
-                 <property name="visible">True</property>\r
-                 <property name="label" translatable="yes">SMTP authentication:</property>\r
-                 <property name="use_underline">False</property>\r
-                 <property name="use_markup">False</property>\r
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-                 <property name="wrap">False</property>\r
-                 <property name="selectable">False</property>\r
-                 <property name="xalign">0.5</property>\r
-                 <property name="yalign">0.5</property>\r
-                 <property name="xpad">0</property>\r
-                 <property name="ypad">0</property>\r
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                 <property name="width_chars">-1</property>\r
-                 <property name="single_line_mode">False</property>\r
-                 <property name="angle">0</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="left_attach">0</property>\r
-                 <property name="right_attach">1</property>\r
-                 <property name="top_attach">0</property>\r
-                 <property name="bottom_attach">1</property>\r
-                 <property name="x_options"></property>\r
-                 <property name="y_options"></property>\r
-               </packing>\r
-             </child>\r
-           </widget>\r
-           <packing>\r
-             <property name="tab_expand">False</property>\r
-             <property name="tab_fill">False</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkLabel" id="label25">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">SMTP server</property>\r
-             <property name="use_underline">False</property>\r
-             <property name="use_markup">False</property>\r
-             <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-             <property name="wrap">False</property>\r
-             <property name="selectable">False</property>\r
-             <property name="xalign">0.5</property>\r
-             <property name="yalign">0.5</property>\r
-             <property name="xpad">0</property>\r
-             <property name="ypad">0</property>\r
-             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-             <property name="width_chars">-1</property>\r
-             <property name="single_line_mode">False</property>\r
-             <property name="angle">0</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="type">tab</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkVBox" id="vbox8">\r
-             <property name="border_width">10</property>\r
-             <property name="visible">True</property>\r
-             <property name="homogeneous">False</property>\r
-             <property name="spacing">10</property>\r
-\r
-             <child>\r
-               <widget class="GtkHBox" id="hbox2">\r
-                 <property name="visible">True</property>\r
-                 <property name="homogeneous">False</property>\r
-                 <property name="spacing">10</property>\r
-\r
-                 <child>\r
-                   <widget class="GtkLabel" id="label29">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Security:</property>\r
-                     <property name="use_underline">False</property>\r
-                     <property name="use_markup">False</property>\r
-                     <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-                     <property name="wrap">False</property>\r
-                     <property name="selectable">False</property>\r
-                     <property name="xalign">0.5</property>\r
-                     <property name="yalign">0.5</property>\r
-                     <property name="xpad">0</property>\r
-                     <property name="ypad">0</property>\r
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                     <property name="width_chars">-1</property>\r
-                     <property name="single_line_mode">False</property>\r
-                     <property name="angle">0</property>\r
-                   </widget>\r
-                   <packing>\r
-                     <property name="padding">0</property>\r
-                     <property name="expand">False</property>\r
-                     <property name="fill">False</property>\r
-                   </packing>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkComboBox" id="combobox3">\r
-                     <property name="visible">True</property>\r
-                     <property name="add_tearoffs">False</property>\r
-                     <property name="focus_on_click">True</property>\r
-                   </widget>\r
-                   <packing>\r
-                     <property name="padding">0</property>\r
-                     <property name="expand">True</property>\r
-                     <property name="fill">True</property>\r
-                   </packing>\r
-                 </child>\r
-               </widget>\r
-               <packing>\r
-                 <property name="padding">0</property>\r
-                 <property name="expand">False</property>\r
-                 <property name="fill">True</property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkHBox" id="hbox4">\r
-                 <property name="visible">True</property>\r
-                 <property name="homogeneous">False</property>\r
-                 <property name="spacing">10</property>\r
-\r
-                 <child>\r
-                   <widget class="GtkLabel" id="label31">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Incoming e-mail port:</property>\r
-                     <property name="use_underline">False</property>\r
-                     <property name="use_markup">False</property>\r
-                     <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-                     <property name="wrap">False</property>\r
-                     <property name="selectable">False</property>\r
-                     <property name="xalign">0.5</property>\r
-                     <property name="yalign">0.5</property>\r
-                     <property name="xpad">0</property>\r
-                     <property name="ypad">0</property>\r
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                     <property name="width_chars">-1</property>\r
-                     <property name="single_line_mode">False</property>\r
-                     <property name="angle">0</property>\r
-                   </widget>\r
-                   <packing>\r
-                     <property name="padding">0</property>\r
-                     <property name="expand">False</property>\r
-                     <property name="fill">False</property>\r
-                   </packing>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkSpinButton" id="spinbutton1">\r
-                     <property name="visible">True</property>\r
-                     <property name="can_focus">True</property>\r
-                     <property name="climb_rate">1</property>\r
-                     <property name="digits">0</property>\r
-                     <property name="numeric">False</property>\r
-                     <property name="update_policy">GTK_UPDATE_ALWAYS</property>\r
-                     <property name="snap_to_ticks">False</property>\r
-                     <property name="wrap">False</property>\r
-                     <property name="adjustment">2 0 100 1 10 10</property>\r
-                   </widget>\r
-                   <packing>\r
-                     <property name="padding">0</property>\r
-                     <property name="expand">False</property>\r
-                     <property name="fill">True</property>\r
-                   </packing>\r
-                 </child>\r
-               </widget>\r
-               <packing>\r
-                 <property name="padding">0</property>\r
-                 <property name="expand">False</property>\r
-                 <property name="fill">False</property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkHBox" id="hbox3">\r
-                 <property name="visible">True</property>\r
-                 <property name="homogeneous">False</property>\r
-                 <property name="spacing">10</property>\r
-\r
-                 <child>\r
-                   <widget class="GtkLabel" id="label30">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Security:</property>\r
-                     <property name="use_underline">False</property>\r
-                     <property name="use_markup">False</property>\r
-                     <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-                     <property name="wrap">False</property>\r
-                     <property name="selectable">False</property>\r
-                     <property name="xalign">0.5</property>\r
-                     <property name="yalign">0.5</property>\r
-                     <property name="xpad">0</property>\r
-                     <property name="ypad">0</property>\r
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                     <property name="width_chars">-1</property>\r
-                     <property name="single_line_mode">False</property>\r
-                     <property name="angle">0</property>\r
-                   </widget>\r
-                   <packing>\r
-                     <property name="padding">0</property>\r
-                     <property name="expand">False</property>\r
-                     <property name="fill">False</property>\r
-                   </packing>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkComboBox" id="combobox4">\r
-                     <property name="visible">True</property>\r
-                     <property name="add_tearoffs">False</property>\r
-                     <property name="focus_on_click">True</property>\r
-                   </widget>\r
-                   <packing>\r
-                     <property name="padding">0</property>\r
-                     <property name="expand">True</property>\r
-                     <property name="fill">True</property>\r
-                   </packing>\r
-                 </child>\r
-               </widget>\r
-               <packing>\r
-                 <property name="padding">0</property>\r
-                 <property name="expand">False</property>\r
-                 <property name="fill">True</property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkHBox" id="hbox5">\r
-                 <property name="visible">True</property>\r
-                 <property name="homogeneous">False</property>\r
-                 <property name="spacing">10</property>\r
-\r
-                 <child>\r
-                   <widget class="GtkLabel" id="label32">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Outgoing e-mail port:</property>\r
-                     <property name="use_underline">False</property>\r
-                     <property name="use_markup">False</property>\r
-                     <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-                     <property name="wrap">False</property>\r
-                     <property name="selectable">False</property>\r
-                     <property name="xalign">0.5</property>\r
-                     <property name="yalign">0.5</property>\r
-                     <property name="xpad">0</property>\r
-                     <property name="ypad">0</property>\r
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                     <property name="width_chars">-1</property>\r
-                     <property name="single_line_mode">False</property>\r
-                     <property name="angle">0</property>\r
-                   </widget>\r
-                   <packing>\r
-                     <property name="padding">0</property>\r
-                     <property name="expand">False</property>\r
-                     <property name="fill">False</property>\r
-                   </packing>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkSpinButton" id="spinbutton2">\r
-                     <property name="visible">True</property>\r
-                     <property name="can_focus">True</property>\r
-                     <property name="climb_rate">1</property>\r
-                     <property name="digits">0</property>\r
-                     <property name="numeric">False</property>\r
-                     <property name="update_policy">GTK_UPDATE_ALWAYS</property>\r
-                     <property name="snap_to_ticks">False</property>\r
-                     <property name="wrap">False</property>\r
-                     <property name="adjustment">1 0 100 1 10 10</property>\r
-                   </widget>\r
-                   <packing>\r
-                     <property name="padding">0</property>\r
-                     <property name="expand">False</property>\r
-                     <property name="fill">True</property>\r
-                   </packing>\r
-                 </child>\r
-               </widget>\r
-               <packing>\r
-                 <property name="padding">0</property>\r
-                 <property name="expand">False</property>\r
-                 <property name="fill">False</property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkHSeparator" id="hseparator2">\r
-                 <property name="visible">True</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="padding">0</property>\r
-                 <property name="expand">False</property>\r
-                 <property name="fill">True</property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkCheckButton" id="checkbutton2">\r
-                 <property name="visible">True</property>\r
-                 <property name="can_focus">True</property>\r
-                 <property name="label" translatable="yes">Use specific connection</property>\r
-                 <property name="use_underline">True</property>\r
-                 <property name="relief">GTK_RELIEF_NORMAL</property>\r
-                 <property name="focus_on_click">True</property>\r
-                 <property name="active">False</property>\r
-                 <property name="inconsistent">False</property>\r
-                 <property name="draw_indicator">True</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="padding">0</property>\r
-                 <property name="expand">False</property>\r
-                 <property name="fill">False</property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkHBox" id="hbox1">\r
-                 <property name="visible">True</property>\r
-                 <property name="homogeneous">False</property>\r
-                 <property name="spacing">10</property>\r
-\r
-                 <child>\r
-                   <widget class="GtkLabel" id="label28">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Connection:</property>\r
-                     <property name="use_underline">False</property>\r
-                     <property name="use_markup">False</property>\r
-                     <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-                     <property name="wrap">False</property>\r
-                     <property name="selectable">False</property>\r
-                     <property name="xalign">0.5</property>\r
-                     <property name="yalign">0.5</property>\r
-                     <property name="xpad">0</property>\r
-                     <property name="ypad">0</property>\r
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                     <property name="width_chars">-1</property>\r
-                     <property name="single_line_mode">False</property>\r
-                     <property name="angle">0</property>\r
-                   </widget>\r
-                   <packing>\r
-                     <property name="padding">0</property>\r
-                     <property name="expand">False</property>\r
-                     <property name="fill">False</property>\r
-                   </packing>\r
-                 </child>\r
-\r
-                 <child>\r
-                   <widget class="GtkEntry" id="entry8">\r
-                     <property name="visible">True</property>\r
-                     <property name="can_focus">True</property>\r
-                     <property name="editable">True</property>\r
-                     <property name="visibility">True</property>\r
-                     <property name="max_length">0</property>\r
-                     <property name="text" translatable="yes"></property>\r
-                     <property name="has_frame">True</property>\r
-                     <property name="invisible_char">*</property>\r
-                     <property name="activates_default">False</property>\r
-                   </widget>\r
-                   <packing>\r
-                     <property name="padding">0</property>\r
-                     <property name="expand">True</property>\r
-                     <property name="fill">True</property>\r
-                   </packing>\r
-                 </child>\r
-               </widget>\r
-               <packing>\r
-                 <property name="padding">0</property>\r
-                 <property name="expand">False</property>\r
-                 <property name="fill">False</property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkHSeparator" id="hseparator1">\r
-                 <property name="visible">True</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="padding">0</property>\r
-                 <property name="expand">False</property>\r
-                 <property name="fill">True</property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkCheckButton" id="checkbutton1">\r
-                 <property name="visible">True</property>\r
-                 <property name="can_focus">True</property>\r
-                 <property name="label" translatable="yes">Set as default mailbox</property>\r
-                 <property name="use_underline">True</property>\r
-                 <property name="relief">GTK_RELIEF_NORMAL</property>\r
-                 <property name="focus_on_click">True</property>\r
-                 <property name="active">False</property>\r
-                 <property name="inconsistent">False</property>\r
-                 <property name="draw_indicator">True</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="padding">0</property>\r
-                 <property name="expand">False</property>\r
-                 <property name="fill">False</property>\r
-               </packing>\r
-             </child>\r
-           </widget>\r
-           <packing>\r
-             <property name="tab_expand">False</property>\r
-             <property name="tab_fill">False</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkLabel" id="label26">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">Other</property>\r
-             <property name="use_underline">False</property>\r
-             <property name="use_markup">False</property>\r
-             <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-             <property name="wrap">False</property>\r
-             <property name="selectable">False</property>\r
-             <property name="xalign">0.5</property>\r
-             <property name="yalign">0.5</property>\r
-             <property name="xpad">0</property>\r
-             <property name="ypad">0</property>\r
-             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-             <property name="width_chars">-1</property>\r
-             <property name="single_line_mode">False</property>\r
-             <property name="angle">0</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="type">tab</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkVBox" id="vbox9">\r
-             <property name="border_width">10</property>\r
-             <property name="visible">True</property>\r
-             <property name="homogeneous">False</property>\r
-             <property name="spacing">10</property>\r
-\r
-             <child>\r
-               <widget class="GtkLabel" id="label33">\r
-                 <property name="visible">True</property>\r
-                 <property name="label" translatable="yes">These security settings will be applied to %s</property>\r
-                 <property name="use_underline">False</property>\r
-                 <property name="use_markup">False</property>\r
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-                 <property name="wrap">False</property>\r
-                 <property name="selectable">False</property>\r
-                 <property name="xalign">0.5</property>\r
-                 <property name="yalign">0.5</property>\r
-                 <property name="xpad">0</property>\r
-                 <property name="ypad">0</property>\r
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                 <property name="width_chars">-1</property>\r
-                 <property name="single_line_mode">False</property>\r
-                 <property name="angle">0</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="padding">0</property>\r
-                 <property name="expand">False</property>\r
-                 <property name="fill">False</property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkHSeparator" id="hseparator4">\r
-                 <property name="visible">True</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="padding">0</property>\r
-                 <property name="expand">False</property>\r
-                 <property name="fill">False</property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkCheckButton" id="checkbutton5">\r
-                 <property name="visible">True</property>\r
-                 <property name="can_focus">True</property>\r
-                 <property name="label" translatable="yes">Encrypt mails by default</property>\r
-                 <property name="use_underline">True</property>\r
-                 <property name="relief">GTK_RELIEF_NORMAL</property>\r
-                 <property name="focus_on_click">True</property>\r
-                 <property name="active">False</property>\r
-                 <property name="inconsistent">False</property>\r
-                 <property name="draw_indicator">True</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="padding">0</property>\r
-                 <property name="expand">False</property>\r
-                 <property name="fill">False</property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkCheckButton" id="checkbutton8">\r
-                 <property name="visible">True</property>\r
-                 <property name="can_focus">True</property>\r
-                 <property name="label" translatable="yes">Digitally sign e-mails by default</property>\r
-                 <property name="use_underline">True</property>\r
-                 <property name="relief">GTK_RELIEF_NORMAL</property>\r
-                 <property name="focus_on_click">True</property>\r
-                 <property name="active">False</property>\r
-                 <property name="inconsistent">False</property>\r
-                 <property name="draw_indicator">True</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="padding">0</property>\r
-                 <property name="expand">False</property>\r
-                 <property name="fill">False</property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkHSeparator" id="hseparator3">\r
-                 <property name="visible">True</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="padding">0</property>\r
-                 <property name="expand">False</property>\r
-                 <property name="fill">False</property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkHBox" id="hbox11">\r
-                 <property name="visible">True</property>\r
-                 <property name="homogeneous">False</property>\r
-                 <property name="spacing">0</property>\r
-\r
-                 <child>\r
-                   <widget class="GtkLabel" id="label39">\r
-                     <property name="visible">True</property>\r
-                     <property name="label" translatable="yes">Display security indication for:</property>\r
-                     <property name="use_underline">False</property>\r
-                     <property name="use_markup">False</property>\r
-                     <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-                     <property name="wrap">False</property>\r
-                     <property name="selectable">False</property>\r
-                     <property name="xalign">0.5</property>\r
-                     <property name="yalign">0.5</property>\r
-                     <property name="xpad">0</property>\r
-                     <property name="ypad">0</property>\r
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-                     <property name="width_chars">-1</property>\r
-                     <property name="single_line_mode">True</property>\r
-                     <property name="angle">0</property>\r
-                   </widget>\r
-                   <packing>\r
-                     <property name="padding">0</property>\r
-                     <property name="expand">False</property>\r
-                     <property name="fill">False</property>\r
-                   </packing>\r
-                 </child>\r
-               </widget>\r
-               <packing>\r
-                 <property name="padding">0</property>\r
-                 <property name="expand">False</property>\r
-                 <property name="fill">False</property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkCheckButton" id="checkbutton3">\r
-                 <property name="visible">True</property>\r
-                 <property name="can_focus">True</property>\r
-                 <property name="label" translatable="yes">All encrypted and digitally signed messages</property>\r
-                 <property name="use_underline">True</property>\r
-                 <property name="relief">GTK_RELIEF_NORMAL</property>\r
-                 <property name="focus_on_click">True</property>\r
-                 <property name="active">False</property>\r
-                 <property name="inconsistent">False</property>\r
-                 <property name="draw_indicator">True</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="padding">0</property>\r
-                 <property name="expand">False</property>\r
-                 <property name="fill">False</property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkCheckButton" id="checkbutton9">\r
-                 <property name="visible">True</property>\r
-                 <property name="can_focus">True</property>\r
-                 <property name="label" translatable="yes">All untrusted digital IDs</property>\r
-                 <property name="use_underline">True</property>\r
-                 <property name="relief">GTK_RELIEF_NORMAL</property>\r
-                 <property name="focus_on_click">True</property>\r
-                 <property name="active">False</property>\r
-                 <property name="inconsistent">False</property>\r
-                 <property name="draw_indicator">True</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="padding">0</property>\r
-                 <property name="expand">False</property>\r
-                 <property name="fill">False</property>\r
-               </packing>\r
-             </child>\r
-\r
-             <child>\r
-               <widget class="GtkCheckButton" id="checkbutton10">\r
-                 <property name="visible">True</property>\r
-                 <property name="can_focus">True</property>\r
-                 <property name="label" translatable="yes">All expired or invalid digital IDs</property>\r
-                 <property name="use_underline">True</property>\r
-                 <property name="relief">GTK_RELIEF_NORMAL</property>\r
-                 <property name="focus_on_click">True</property>\r
-                 <property name="active">False</property>\r
-                 <property name="inconsistent">False</property>\r
-                 <property name="draw_indicator">True</property>\r
-               </widget>\r
-               <packing>\r
-                 <property name="padding">0</property>\r
-                 <property name="expand">False</property>\r
-                 <property name="fill">False</property>\r
-               </packing>\r
-             </child>\r
-           </widget>\r
-           <packing>\r
-             <property name="tab_expand">False</property>\r
-             <property name="tab_fill">True</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkLabel" id="label27">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">Security</property>\r
-             <property name="use_underline">False</property>\r
-             <property name="use_markup">False</property>\r
-             <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-             <property name="wrap">False</property>\r
-             <property name="selectable">False</property>\r
-             <property name="xalign">0.5</property>\r
-             <property name="yalign">0.5</property>\r
-             <property name="xpad">0</property>\r
-             <property name="ypad">0</property>\r
-             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-             <property name="width_chars">-1</property>\r
-             <property name="single_line_mode">False</property>\r
-             <property name="angle">0</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="type">tab</property>\r
-           </packing>\r
-         </child>\r
-       </widget>\r
-       <packing>\r
-         <property name="padding">0</property>\r
-         <property name="expand">True</property>\r
-         <property name="fill">True</property>\r
-       </packing>\r
-      </child>\r
-    </widget>\r
-  </child>\r
-</widget>\r
-\r
-<widget class="GtkDialog" id="mailbox_setup_3">\r
-  <property name="border_width">10</property>\r
-  <property name="width_request">400</property>\r
-  <property name="height_request">350</property>\r
-  <property name="visible">True</property>\r
-  <property name="title" translatable="yes">Mailbox setup 3/4</property>\r
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>\r
-  <property name="window_position">GTK_WIN_POS_NONE</property>\r
-  <property name="modal">False</property>\r
-  <property name="default_width">500</property>\r
-  <property name="default_height">400</property>\r
-  <property name="resizable">False</property>\r
-  <property name="destroy_with_parent">False</property>\r
-  <property name="decorated">True</property>\r
-  <property name="skip_taskbar_hint">False</property>\r
-  <property name="skip_pager_hint">False</property>\r
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>\r
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>\r
-  <property name="focus_on_map">True</property>\r
-  <property name="urgency_hint">False</property>\r
-  <property name="has_separator">True</property>\r
-\r
-  <child internal-child="vbox">\r
-    <widget class="GtkVBox" id="vbox11">\r
-      <property name="visible">True</property>\r
-      <property name="homogeneous">False</property>\r
-      <property name="spacing">0</property>\r
-\r
-      <child internal-child="action_area">\r
-       <widget class="GtkHButtonBox" id="hbuttonbox4">\r
-         <property name="visible">True</property>\r
-         <property name="layout_style">GTK_BUTTONBOX_END</property>\r
-\r
-         <child>\r
-           <widget class="GtkButton" id="button18">\r
-             <property name="visible">True</property>\r
-             <property name="can_default">True</property>\r
-             <property name="can_focus">True</property>\r
-             <property name="label" translatable="yes">Finish</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="relief">GTK_RELIEF_NORMAL</property>\r
-             <property name="focus_on_click">True</property>\r
-             <property name="response_id">0</property>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkButton" id="button19">\r
-             <property name="visible">True</property>\r
-             <property name="can_default">True</property>\r
-             <property name="can_focus">True</property>\r
-             <property name="label" translatable="yes">Back</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="relief">GTK_RELIEF_NORMAL</property>\r
-             <property name="focus_on_click">True</property>\r
-             <property name="response_id">0</property>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkButton" id="button20">\r
-             <property name="visible">True</property>\r
-             <property name="can_default">True</property>\r
-             <property name="can_focus">True</property>\r
-             <property name="label" translatable="yes">Next</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="relief">GTK_RELIEF_NORMAL</property>\r
-             <property name="focus_on_click">True</property>\r
-             <property name="response_id">0</property>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkButton" id="button21">\r
-             <property name="visible">True</property>\r
-             <property name="can_default">True</property>\r
-             <property name="can_focus">True</property>\r
-             <property name="label" translatable="yes">Cancel</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="relief">GTK_RELIEF_NORMAL</property>\r
-             <property name="focus_on_click">True</property>\r
-             <property name="response_id">0</property>\r
-           </widget>\r
-         </child>\r
-       </widget>\r
-       <packing>\r
-         <property name="padding">0</property>\r
-         <property name="expand">False</property>\r
-         <property name="fill">True</property>\r
-         <property name="pack_type">GTK_PACK_END</property>\r
-       </packing>\r
-      </child>\r
-\r
-      <child>\r
-       <widget class="GtkTable" id="table9">\r
-         <property name="visible">True</property>\r
-         <property name="n_rows">2</property>\r
-         <property name="n_columns">2</property>\r
-         <property name="homogeneous">False</property>\r
-         <property name="row_spacing">10</property>\r
-         <property name="column_spacing">10</property>\r
-\r
-         <child>\r
-           <widget class="GtkLabel" id="label55">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">Outgoing server:</property>\r
-             <property name="use_underline">False</property>\r
-             <property name="use_markup">False</property>\r
-             <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-             <property name="wrap">False</property>\r
-             <property name="selectable">False</property>\r
-             <property name="xalign">0</property>\r
-             <property name="yalign">0.5</property>\r
-             <property name="xpad">0</property>\r
-             <property name="ypad">0</property>\r
-             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-             <property name="width_chars">-1</property>\r
-             <property name="single_line_mode">False</property>\r
-             <property name="angle">0</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="left_attach">0</property>\r
-             <property name="right_attach">1</property>\r
-             <property name="top_attach">1</property>\r
-             <property name="bottom_attach">2</property>\r
-             <property name="x_options">fill</property>\r
-             <property name="y_options"></property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkLabel" id="label54">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">Incoming server:</property>\r
-             <property name="use_underline">False</property>\r
-             <property name="use_markup">False</property>\r
-             <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-             <property name="wrap">False</property>\r
-             <property name="selectable">False</property>\r
-             <property name="xalign">0</property>\r
-             <property name="yalign">0.5</property>\r
-             <property name="xpad">0</property>\r
-             <property name="ypad">0</property>\r
-             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-             <property name="width_chars">-1</property>\r
-             <property name="single_line_mode">False</property>\r
-             <property name="angle">0</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="left_attach">0</property>\r
-             <property name="right_attach">1</property>\r
-             <property name="top_attach">0</property>\r
-             <property name="bottom_attach">1</property>\r
-             <property name="x_options">fill</property>\r
-             <property name="y_options"></property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkComboBoxEntry" id="comboboxentry4">\r
-             <property name="visible">True</property>\r
-             <property name="add_tearoffs">False</property>\r
-             <property name="has_frame">True</property>\r
-             <property name="focus_on_click">True</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="left_attach">1</property>\r
-             <property name="right_attach">2</property>\r
-             <property name="top_attach">0</property>\r
-             <property name="bottom_attach">1</property>\r
-             <property name="y_options">fill</property>\r
-           </packing>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkComboBoxEntry" id="comboboxentry5">\r
-             <property name="visible">True</property>\r
-             <property name="add_tearoffs">False</property>\r
-             <property name="has_frame">True</property>\r
-             <property name="focus_on_click">True</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="left_attach">1</property>\r
-             <property name="right_attach">2</property>\r
-             <property name="top_attach">1</property>\r
-             <property name="bottom_attach">2</property>\r
-             <property name="x_options">fill</property>\r
-             <property name="y_options">fill</property>\r
-           </packing>\r
-         </child>\r
-       </widget>\r
-       <packing>\r
-         <property name="padding">0</property>\r
-         <property name="expand">True</property>\r
-         <property name="fill">True</property>\r
-       </packing>\r
-      </child>\r
-    </widget>\r
-  </child>\r
-</widget>\r
-\r
-<widget class="GtkDialog" id="mailbox_setup_4">\r
-  <property name="border_width">10</property>\r
-  <property name="width_request">400</property>\r
-  <property name="height_request">350</property>\r
-  <property name="visible">True</property>\r
-  <property name="title" translatable="yes">Mailbox setup 4/4</property>\r
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>\r
-  <property name="window_position">GTK_WIN_POS_NONE</property>\r
-  <property name="modal">False</property>\r
-  <property name="default_width">500</property>\r
-  <property name="default_height">400</property>\r
-  <property name="resizable">False</property>\r
-  <property name="destroy_with_parent">False</property>\r
-  <property name="decorated">True</property>\r
-  <property name="skip_taskbar_hint">False</property>\r
-  <property name="skip_pager_hint">False</property>\r
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>\r
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>\r
-  <property name="focus_on_map">True</property>\r
-  <property name="urgency_hint">False</property>\r
-  <property name="has_separator">True</property>\r
-\r
-  <child internal-child="vbox">\r
-    <widget class="GtkVBox" id="vbox12">\r
-      <property name="visible">True</property>\r
-      <property name="homogeneous">False</property>\r
-      <property name="spacing">0</property>\r
-\r
-      <child internal-child="action_area">\r
-       <widget class="GtkHButtonBox" id="hbuttonbox5">\r
-         <property name="visible">True</property>\r
-         <property name="layout_style">GTK_BUTTONBOX_END</property>\r
-\r
-         <child>\r
-           <widget class="GtkButton" id="button22">\r
-             <property name="visible">True</property>\r
-             <property name="can_default">True</property>\r
-             <property name="can_focus">True</property>\r
-             <property name="label" translatable="yes">Finish</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="relief">GTK_RELIEF_NORMAL</property>\r
-             <property name="focus_on_click">True</property>\r
-             <property name="response_id">0</property>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkButton" id="button23">\r
-             <property name="visible">True</property>\r
-             <property name="can_default">True</property>\r
-             <property name="can_focus">True</property>\r
-             <property name="label" translatable="yes">Back</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="relief">GTK_RELIEF_NORMAL</property>\r
-             <property name="focus_on_click">True</property>\r
-             <property name="response_id">0</property>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkButton" id="button24">\r
-             <property name="visible">True</property>\r
-             <property name="can_default">True</property>\r
-             <property name="can_focus">True</property>\r
-             <property name="label" translatable="yes">Advanced</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="relief">GTK_RELIEF_NORMAL</property>\r
-             <property name="focus_on_click">True</property>\r
-             <property name="response_id">0</property>\r
-           </widget>\r
-         </child>\r
-\r
-         <child>\r
-           <widget class="GtkButton" id="button25">\r
-             <property name="visible">True</property>\r
-             <property name="can_default">True</property>\r
-             <property name="can_focus">True</property>\r
-             <property name="label" translatable="yes">Cancel</property>\r
-             <property name="use_underline">True</property>\r
-             <property name="relief">GTK_RELIEF_NORMAL</property>\r
-             <property name="focus_on_click">True</property>\r
-             <property name="response_id">0</property>\r
-           </widget>\r
-         </child>\r
-       </widget>\r
-       <packing>\r
-         <property name="padding">0</property>\r
-         <property name="expand">False</property>\r
-         <property name="fill">True</property>\r
-         <property name="pack_type">GTK_PACK_END</property>\r
-       </packing>\r
-      </child>\r
-\r
-      <child>\r
-       <widget class="GtkHBox" id="hbox19">\r
-         <property name="visible">True</property>\r
-         <property name="homogeneous">False</property>\r
-         <property name="spacing">0</property>\r
-\r
-         <child>\r
-           <widget class="GtkLabel" id="label56">\r
-             <property name="visible">True</property>\r
-             <property name="label" translatable="yes">Mailbox setup is complete.\r
-\r
-Tap 'Finnish' to save or 'Cancel' to discard the settings.\r
-Tap 'Advanced' to edit the advanced e-mail settings.</property>\r
-             <property name="use_underline">False</property>\r
-             <property name="use_markup">False</property>\r
-             <property name="justify">GTK_JUSTIFY_LEFT</property>\r
-             <property name="wrap">False</property>\r
-             <property name="selectable">False</property>\r
-             <property name="xalign">0.5</property>\r
-             <property name="yalign">0.5</property>\r
-             <property name="xpad">0</property>\r
-             <property name="ypad">0</property>\r
-             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>\r
-             <property name="width_chars">-1</property>\r
-             <property name="single_line_mode">False</property>\r
-             <property name="angle">0</property>\r
-           </widget>\r
-           <packing>\r
-             <property name="padding">0</property>\r
-             <property name="expand">False</property>\r
-             <property name="fill">False</property>\r
-           </packing>\r
-         </child>\r
-       </widget>\r
-       <packing>\r
-         <property name="padding">0</property>\r
-         <property name="expand">False</property>\r
-         <property name="fill">False</property>\r
-       </packing>\r
-      </child>\r
-    </widget>\r
-  </child>\r
-</widget>\r
-\r
-</glade-interface>\r
diff --git a/experimental/UI/modest.gladep b/experimental/UI/modest.gladep
deleted file mode 100644 (file)
index 88b3fe8..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->\r
-<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">\r
-\r
-<glade-project>\r
-  <name>Modest</name>\r
-  <program_name>Modest</program_name>\r
-  <gnome_support>FALSE</gnome_support>\r
-</glade-project>\r
diff --git a/experimental/UI/pixmaps/qgn_list_gene_attacpap.png b/experimental/UI/pixmaps/qgn_list_gene_attacpap.png
deleted file mode 100644 (file)
index 0448a7d..0000000
Binary files a/experimental/UI/pixmaps/qgn_list_gene_attacpap.png and /dev/null differ
diff --git a/experimental/UI/pixmaps/qgn_list_gene_bold.png b/experimental/UI/pixmaps/qgn_list_gene_bold.png
deleted file mode 100644 (file)
index 5d10d3f..0000000
Binary files a/experimental/UI/pixmaps/qgn_list_gene_bold.png and /dev/null differ
diff --git a/experimental/UI/pixmaps/qgn_list_gene_contacts.png b/experimental/UI/pixmaps/qgn_list_gene_contacts.png
deleted file mode 100644 (file)
index 350271d..0000000
Binary files a/experimental/UI/pixmaps/qgn_list_gene_contacts.png and /dev/null differ
diff --git a/experimental/UI/pixmaps/qgn_list_gene_italic.png b/experimental/UI/pixmaps/qgn_list_gene_italic.png
deleted file mode 100644 (file)
index 638fa90..0000000
Binary files a/experimental/UI/pixmaps/qgn_list_gene_italic.png and /dev/null differ
diff --git a/experimental/UI/pixmaps/qgn_toolb_messagin.png b/experimental/UI/pixmaps/qgn_toolb_messagin.png
deleted file mode 100644 (file)
index 4c4899b..0000000
Binary files a/experimental/UI/pixmaps/qgn_toolb_messagin.png and /dev/null differ
diff --git a/experimental/UI/pixmaps/qgn_toolb_messagin_bullets.png b/experimental/UI/pixmaps/qgn_toolb_messagin_bullets.png
deleted file mode 100644 (file)
index aee5a70..0000000
Binary files a/experimental/UI/pixmaps/qgn_toolb_messagin_bullets.png and /dev/null differ
diff --git a/experimental/UI/pixmaps/qgn_toolb_messagin_delete.png b/experimental/UI/pixmaps/qgn_toolb_messagin_delete.png
deleted file mode 100644 (file)
index 0f31b07..0000000
Binary files a/experimental/UI/pixmaps/qgn_toolb_messagin_delete.png and /dev/null differ
diff --git a/experimental/UI/pixmaps/qgn_toolb_messagin_fontcolor.png b/experimental/UI/pixmaps/qgn_toolb_messagin_fontcolor.png
deleted file mode 100644 (file)
index 49304cd..0000000
Binary files a/experimental/UI/pixmaps/qgn_toolb_messagin_fontcolor.png and /dev/null differ
diff --git a/experimental/UI/pixmaps/qgn_toolb_messagin_forward.png b/experimental/UI/pixmaps/qgn_toolb_messagin_forward.png
deleted file mode 100644 (file)
index b286238..0000000
Binary files a/experimental/UI/pixmaps/qgn_toolb_messagin_forward.png and /dev/null differ
diff --git a/experimental/UI/pixmaps/qgn_toolb_messagin_moveto.png b/experimental/UI/pixmaps/qgn_toolb_messagin_moveto.png
deleted file mode 100644 (file)
index 3497a2a..0000000
Binary files a/experimental/UI/pixmaps/qgn_toolb_messagin_moveto.png and /dev/null differ
diff --git a/experimental/UI/pixmaps/qgn_toolb_messagin_new.png b/experimental/UI/pixmaps/qgn_toolb_messagin_new.png
deleted file mode 100644 (file)
index b93921e..0000000
Binary files a/experimental/UI/pixmaps/qgn_toolb_messagin_new.png and /dev/null differ
diff --git a/experimental/UI/pixmaps/qgn_toolb_messagin_next.png b/experimental/UI/pixmaps/qgn_toolb_messagin_next.png
deleted file mode 100644 (file)
index 6d70431..0000000
Binary files a/experimental/UI/pixmaps/qgn_toolb_messagin_next.png and /dev/null differ
diff --git a/experimental/UI/pixmaps/qgn_toolb_messagin_previous.png b/experimental/UI/pixmaps/qgn_toolb_messagin_previous.png
deleted file mode 100644 (file)
index 184e319..0000000
Binary files a/experimental/UI/pixmaps/qgn_toolb_messagin_previous.png and /dev/null differ
diff --git a/experimental/UI/pixmaps/qgn_toolb_messagin_reply.png b/experimental/UI/pixmaps/qgn_toolb_messagin_reply.png
deleted file mode 100644 (file)
index 5cdd7c2..0000000
Binary files a/experimental/UI/pixmaps/qgn_toolb_messagin_reply.png and /dev/null differ
diff --git a/experimental/UI/pixmaps/qgn_toolb_messagin_replytoall.png b/experimental/UI/pixmaps/qgn_toolb_messagin_replytoall.png
deleted file mode 100644 (file)
index 78cde69..0000000
Binary files a/experimental/UI/pixmaps/qgn_toolb_messagin_replytoall.png and /dev/null differ
diff --git a/experimental/UI/pixmaps/qgn_toolb_messagin_saveattachment.png b/experimental/UI/pixmaps/qgn_toolb_messagin_saveattachment.png
deleted file mode 100644 (file)
index 02d7eb1..0000000
Binary files a/experimental/UI/pixmaps/qgn_toolb_messagin_saveattachment.png and /dev/null differ
diff --git a/experimental/UI/pixmaps/qgn_toolb_messagin_send.png b/experimental/UI/pixmaps/qgn_toolb_messagin_send.png
deleted file mode 100644 (file)
index 84a3420..0000000
Binary files a/experimental/UI/pixmaps/qgn_toolb_messagin_send.png and /dev/null differ
diff --git a/experimental/UI/pixmaps/qgn_toolb_messagin_sendreceive.png b/experimental/UI/pixmaps/qgn_toolb_messagin_sendreceive.png
deleted file mode 100644 (file)
index 0b794cd..0000000
Binary files a/experimental/UI/pixmaps/qgn_toolb_messagin_sendreceive.png and /dev/null differ
diff --git a/experimental/accountpresets/Makefile b/experimental/accountpresets/Makefile
deleted file mode 100644 (file)
index 3751496..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-# Makefile for testing ModestAccountPresets
-
-test-modest-account-presets: modest-account-presets.o test-modest-account-presets.o
-       $(CC) -o test-modest-account-presets test-modest-account-presets.o modest-account-presets.o `pkg-config --libs gobject-2.0`
-
-modest-account-presets.o: modest-account-presets.c modest-account-presets.h
-       $(CC) -c modest-account-presets.c -g -Wall `pkg-config --cflags gobject-2.0`
-
-test-modest-account-presets.o: test-modest-account-presets.c modest-account-presets.h
-       $(CC) -c test-modest-account-presets.c -g -Wall `pkg-config --cflags gobject-2.0`
-
-clean:
-       rm -f *.o *~ core
diff --git a/experimental/accountpresets/modest-account-presets.c b/experimental/accountpresets/modest-account-presets.c
deleted file mode 100644 (file)
index cdea9d7..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-/* modest-account-presets.c */
-
-/* insert (c)/licensing information) */
-
-#include "modest-account-presets.h"
-/* include other impl specific header files */
-
-/* 'private'/'protected' functions */
-static void                        modest_account_presets_class_init    (ModestAccountPresetsClass *klass);
-static void                        modest_account_presets_init          (ModestAccountPresets *obj);
-static void                        modest_account_presets_finalize      (GObject *obj);
-
-/* list my signals */
-enum {
-       /* MY_SIGNAL_1, */
-       /* MY_SIGNAL_2, */
-       LAST_SIGNAL
-};
-
-typedef struct _ModestAccountPresetsPrivate ModestAccountPresetsPrivate;
-struct _ModestAccountPresetsPrivate {
-       /* my private members go here, eg. */
-       GKeyFile *preset_file;
-       GList *preset_list;
-};
-#define MODEST_ACCOUNT_PRESETS_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
-                                                    MODEST_TYPE_ACCOUNT_PRESETS, \
-                                                    ModestAccountPresetsPrivate))
-/* globals */
-static GObjectClass *parent_class = NULL;
-
-/* uncomment the following if you have defined any signals */
-/* static guint signals[LAST_SIGNAL] = {0}; */
-
-GType
-modest_account_presets_get_type (void)
-{
-       static GType my_type = 0;
-       if (!my_type) {
-               static const GTypeInfo my_info = {
-                       sizeof(ModestAccountPresetsClass),
-                       NULL,           /* base init */
-                       NULL,           /* base finalize */
-                       (GClassInitFunc) modest_account_presets_class_init,
-                       NULL,           /* class finalize */
-                       NULL,           /* class data */
-                       sizeof(ModestAccountPresets),
-                       1,              /* n_preallocs */
-                       (GInstanceInitFunc) modest_account_presets_init,
-               };
-               my_type = g_type_register_static (G_TYPE_OBJECT,
-                                                 "ModestAccountPresets",
-                                                 &my_info, 0);
-       }
-       return my_type;
-}
-
-static void
-modest_account_presets_class_init (ModestAccountPresetsClass *klass)
-{
-       GObjectClass *gobject_class;
-       gobject_class = (GObjectClass*) klass;
-
-       parent_class            = g_type_class_peek_parent (klass);
-       gobject_class->finalize = modest_account_presets_finalize;
-
-       g_type_class_add_private (gobject_class, sizeof(ModestAccountPresetsPrivate));
-
-       klass->get_list = modest_account_presets_get_list;
-       klass->get_names = modest_account_presets_get_names;
-       klass->get_by_name = modest_account_presets_get_by_name;
-       klass->load_file = modest_account_presets_load_file;
-       /* signal definitions go here, e.g.: */
-/*     signals[MY_SIGNAL_1] = */
-/*             g_signal_new ("my_signal_1",....); */
-/*     signals[MY_SIGNAL_2] = */
-/*             g_signal_new ("my_signal_2",....); */
-/*     etc. */
-}
-
-static void
-modest_account_presets_init (ModestAccountPresets *obj)
-{
-       ModestAccountPresetsPrivate *priv = MODEST_ACCOUNT_PRESETS_GET_PRIVATE(obj);
-
-       priv->preset_file = g_key_file_new ();
-       priv->preset_list = NULL;
-       obj->count = 0; 
-}
-
-static void
-modest_account_presets_finalize (GObject *obj)
-{
-       ModestAccountPresetsPrivate *priv = MODEST_ACCOUNT_PRESETS_GET_PRIVATE(obj);
-
-       g_object_unref (priv->preset_file);
-}
-
-GObject*
-modest_account_presets_new (void)
-{
-       return G_OBJECT(g_object_new(MODEST_TYPE_ACCOUNT_PRESETS, NULL));
-}
-
-/* method implementations */
-
-GList *
-modest_account_presets_get_list (ModestAccountPresets *self)
-{
-       
-}
-
-GList *
-modest_account_presets_get_names (ModestAccountPresets *self)
-{
-}
-
-ModestPreset *
-modest_account_presets_get_by_name (ModestAccountPresets *self, const gchar *name)
-{
-       
-}
-
-gboolean 
-modest_account_presets_load_file (ModestAccountPresets *self, const gchar *filename)
-{
-       
-       return TRUE;
-}
diff --git a/experimental/accountpresets/modest-account-presets.h b/experimental/accountpresets/modest-account-presets.h
deleted file mode 100644 (file)
index cdc5613..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-/* modest-account-presets.h */
-/* insert (c)/licensing information) */
-
-#ifndef __MODEST_ACCOUNT_PRESETS_H__
-#define __MODEST_ACCOUNT_PRESETS_H__
-
-#include <glib-object.h>
-/* other include files */
-
-G_BEGIN_DECLS
-
-/* convenience macros */
-#define MODEST_TYPE_ACCOUNT_PRESETS             (modest_account_presets_get_type())
-#define MODEST_ACCOUNT_PRESETS(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj),MODEST_TYPE_ACCOUNT_PRESETS,ModestAccountPresets))
-#define MODEST_ACCOUNT_PRESETS_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass),MODEST_TYPE_ACCOUNT_PRESETS,GObject))
-#define MODEST_IS_ACCOUNT_PRESETS(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj),MODEST_TYPE_ACCOUNT_PRESETS))
-#define MODEST_IS_ACCOUNT_PRESETS_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass),MODEST_TYPE_ACCOUNT_PRESETS))
-#define MODEST_ACCOUNT_PRESETS_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj),MODEST_TYPE_ACCOUNT_PRESETS,ModestAccountPresetsClass))
-
-typedef struct _ModestAccountPresets      ModestAccountPresets;
-typedef struct _ModestAccountPresetsClass ModestAccountPresetsClass;
-
-typedef struct _ModestPreset      ModestPreset;
-
-struct _ModestAccountPresets {
-       GObject parent;
-       /* public members */
-       gint count;     /* number of available presets */
-};
-
-struct _ModestAccountPresetsClass {
-       GObjectClass parent_class;
-       GList * (* get_list) (ModestAccountPresets *self);
-       GList * (* get_names) (ModestAccountPresets *self);
-       ModestPreset * (* get_by_name) (ModestAccountPresets *self, const gchar *name);
-       gboolean (* load_file) (ModestAccountPresets *self, const gchar *filename);
-};
-
-/* data type to hold an account preset dataset */
-struct _ModestPreset {
-       gchar *name;
-       gchar *transport_server;
-       gchar *storage_server;
-       gint transport_port;
-       gint storage_port;
-       /* add security stuff */
-       gchar *note;
-};
-
-/* member functions */
-GType        modest_account_presets_get_type    (void) G_GNUC_CONST;
-
-/* typical parameter-less _new function */
-GObject*    modest_account_presets_new         (void);
-
-/* public methods */
-GList *modest_account_presets_get_list (ModestAccountPresets *self);
-GList *modest_account_presets_get_names (ModestAccountPresets *self);
-ModestPreset *modest_account_presets_get_by_name (ModestAccountPresets *self, const gchar *name);
-gboolean modest_account_presets_load_file (ModestAccountPresets *self, const gchar *filename);
-
-
-G_END_DECLS
-
-#endif /* __MODEST_ACCOUNT_PRESETS_H__ */
diff --git a/experimental/accountpresets/test-modest-account-presets.c b/experimental/accountpresets/test-modest-account-presets.c
deleted file mode 100644 (file)
index 7a39522..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/* unit test for the ModestAccountPresets implementation */
-
-#include "modest-account-presets.h"
-
-int
-main (int argc, char* argv[])
-{
-       GObject *obj;
-
-       g_type_init ();
-
-       obj = modest_account_presets_new ();
-/* do something interesting with our brand new object */
-
-       return 0;
-}
diff --git a/experimental/display_glade/Makefile b/experimental/display_glade/Makefile
deleted file mode 100644 (file)
index 7d73e18..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-# Mind -Wl,-export-dynamic in case, a signal handler is defined in the main file!
-export CFLAGS=`pkg-config --cflags libglade-2.0`
-export LDFLAGS=`pkg-config --libs libglade-2.0` -export-dynamic
-
-TARGET=showme
-
-MEMBERS=${TARGET}
-
-DEPS = $(patsubst %,%.d,$(MEMBERS))
-OBJECTS = $(patsubst %,%.o,$(MEMBERS))
-
-all: ${TARGET}
-
-
-${TARGET}: ${OBJECTS}
-       ${CC} -o ${TARGET} ${OBJECTS} ${CFLAGS} ${LDFLAGS}
-
-clean:
-       rm ${OBJECTS} ${TARGET}
-
--include ${DEPS}
-
-
-
diff --git a/experimental/display_glade/showme.c b/experimental/display_glade/showme.c
deleted file mode 100644 (file)
index 240eb14..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <gtk/gtk.h>
-#include <glade/glade.h>
-/*
- * #include "mysignals.h"
- */
-
-int main (int argc,
-          char *argv[])
-{
-    GladeXML *xml;
-    GtkWidget *widget;
-
-    gtk_init(&argc,
-             &argv);
-    glade_init();
-
-    if (argc<2)
-        return 0;
-
-    /* load the interface */
-    xml=glade_xml_new(argv[1], argc > 2 ? argv[2] : NULL, NULL);
-
-    /* connect signal handlers */
-    glade_xml_signal_autoconnect(xml);
-
-    gtk_main();
-
-    return 0;
-}
-
diff --git a/experimental/modest/AUTHORS b/experimental/modest/AUTHORS
deleted file mode 100644 (file)
index 997a6ec..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>
diff --git a/experimental/modest/COPYING b/experimental/modest/COPYING
deleted file mode 100644 (file)
index 8b13789..0000000
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/experimental/modest/ChangeLog b/experimental/modest/ChangeLog
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/experimental/modest/INSTALL b/experimental/modest/INSTALL
deleted file mode 100644 (file)
index 54caf7c..0000000
+++ /dev/null
@@ -1,229 +0,0 @@
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
-Foundation, Inc.
-
-   This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-   These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
-for details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-   Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-will cause the specified gcc to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-`configure' Invocation
-======================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-
diff --git a/experimental/modest/Makefile.am b/experimental/modest/Makefile.am
deleted file mode 100644 (file)
index 1e49191..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Makefile.am for modest
-# Time-stamp: <2006-04-22 16:29:00 (djcb)>
-#
-
-SUBDIRS=src docs
-EXTRA_DIST=autogen.sh 
diff --git a/experimental/modest/NEWS b/experimental/modest/NEWS
deleted file mode 100644 (file)
index b7cf89b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-No news
diff --git a/experimental/modest/README b/experimental/modest/README
deleted file mode 100644 (file)
index 4388450..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-modest
-------
-
-"modest" is a modest e-mail program, based on Philip van Hoofs *tinymail*.
-tinymail is an effort to ease the writing of email programs, in particular
-for small devices.
-
-And while tinymail can support just about anything, we are using it's 
-*libcamel* backend for mail protocol implementation.
-
-More about camel: http://go-evolution.org/Camel (* currently down *)
-More about tinymail: https://svn.cronos.be/svn/tinymail/trunk/
-
-
-
diff --git a/experimental/modest/autogen.sh b/experimental/modest/autogen.sh
deleted file mode 100755 (executable)
index a795a83..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-REQUIRED_AUTOMAKE_VERSION=1.7
-PKG_NAME=modest
-
-(test -f $srcdir/configure.ac \
-  && test -f $srcdir/src/modest-main.c) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level $PKG_NAME directory"
-    exit 1
-}
-
-which gnome-autogen.sh || {
-    echo "You need to install gnome-common from GNOME CVS"
-    exit 1
-}
-USE_GNOME2_MACROS=1 . gnome-autogen.sh
-
-gtkdocize || {
-    echo -n "**Error**: gtkdoc not found. Please install"
-    exit 1
-}
-
diff --git a/experimental/modest/config.guess b/experimental/modest/config.guess
deleted file mode 100755 (executable)
index ad5281e..0000000
+++ /dev/null
@@ -1,1466 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-timestamp='2005-08-03'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )        # Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-       for c in cc gcc c89 c99 ; do
-         if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-            CC_FOR_BUILD="$c"; break ;
-         fi ;
-       done ;
-       if test x"$CC_FOR_BUILD" = x ; then
-         CC_FOR_BUILD=no_compiler_found ;
-       fi
-       ;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-       PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-       # NetBSD (nbsd) targets should (where applicable) match one or
-       # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-       # *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-       # switched to ELF, *-*-netbsd* would select the old
-       # object file format.  This provides both forward
-       # compatibility and a consistent mechanism for selecting the
-       # object file format.
-       #
-       # Note: NetBSD doesn't particularly care about the vendor
-       # portion of the name.  We always set it to "unknown".
-       sysctl="sysctl -n hw.machine_arch"
-       UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-           /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-       case "${UNAME_MACHINE_ARCH}" in
-           armeb) machine=armeb-unknown ;;
-           arm*) machine=arm-unknown ;;
-           sh3el) machine=shl-unknown ;;
-           sh3eb) machine=sh-unknown ;;
-           *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-       esac
-       # The Operating System including object format, if it has switched
-       # to ELF recently, or will in the future.
-       case "${UNAME_MACHINE_ARCH}" in
-           arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-               eval $set_cc_for_build
-               if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-                       | grep __ELF__ >/dev/null
-               then
-                   # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-                   # Return netbsd for either.  FIX?
-                   os=netbsd
-               else
-                   os=netbsdelf
-               fi
-               ;;
-           *)
-               os=netbsd
-               ;;
-       esac
-       # The OS release
-       # Debian GNU/NetBSD machines have a different userland, and
-       # thus, need a distinct triplet. However, they do not need
-       # kernel version information, so it can be replaced with a
-       # suitable tag, in the style of linux-gnu.
-       case "${UNAME_VERSION}" in
-           Debian*)
-               release='-gnu'
-               ;;
-           *)
-               release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-               ;;
-       esac
-       # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-       # contains redundant information, the shorter form:
-       # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-       echo "${machine}-${os}${release}"
-       exit ;;
-    *:OpenBSD:*:*)
-       UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-       echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-       exit ;;
-    *:ekkoBSD:*:*)
-       echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-       exit ;;
-    macppc:MirBSD:*:*)
-       echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-       exit ;;
-    *:MirBSD:*:*)
-       echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-       exit ;;
-    alpha:OSF1:*:*)
-       case $UNAME_RELEASE in
-       *4.0)
-               UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-               ;;
-       *5.*)
-               UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-               ;;
-       esac
-       # According to Compaq, /usr/sbin/psrinfo has been available on
-       # OSF/1 and Tru64 systems produced since 1995.  I hope that
-       # covers most systems running today.  This code pipes the CPU
-       # types through head -n 1, so we only detect the type of CPU 0.
-       ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-       case "$ALPHA_CPU_TYPE" in
-           "EV4 (21064)")
-               UNAME_MACHINE="alpha" ;;
-           "EV4.5 (21064)")
-               UNAME_MACHINE="alpha" ;;
-           "LCA4 (21066/21068)")
-               UNAME_MACHINE="alpha" ;;
-           "EV5 (21164)")
-               UNAME_MACHINE="alphaev5" ;;
-           "EV5.6 (21164A)")
-               UNAME_MACHINE="alphaev56" ;;
-           "EV5.6 (21164PC)")
-               UNAME_MACHINE="alphapca56" ;;
-           "EV5.7 (21164PC)")
-               UNAME_MACHINE="alphapca57" ;;
-           "EV6 (21264)")
-               UNAME_MACHINE="alphaev6" ;;
-           "EV6.7 (21264A)")
-               UNAME_MACHINE="alphaev67" ;;
-           "EV6.8CB (21264C)")
-               UNAME_MACHINE="alphaev68" ;;
-           "EV6.8AL (21264B)")
-               UNAME_MACHINE="alphaev68" ;;
-           "EV6.8CX (21264D)")
-               UNAME_MACHINE="alphaev68" ;;
-           "EV6.9A (21264/EV69A)")
-               UNAME_MACHINE="alphaev69" ;;
-           "EV7 (21364)")
-               UNAME_MACHINE="alphaev7" ;;
-           "EV7.9 (21364A)")
-               UNAME_MACHINE="alphaev79" ;;
-       esac
-       # A Pn.n version is a patched version.
-       # A Vn.n version is a released version.
-       # A Tn.n version is a released field test version.
-       # A Xn.n version is an unreleased experimental baselevel.
-       # 1.2 uses "1.2" for uname -r.
-       echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-       exit ;;
-    Alpha\ *:Windows_NT*:*)
-       # How do we know it's Interix rather than the generic POSIX subsystem?
-       # Should we change UNAME_MACHINE based on the output of uname instead
-       # of the specific Alpha model?
-       echo alpha-pc-interix
-       exit ;;
-    21064:Windows_NT:50:3)
-       echo alpha-dec-winnt3.5
-       exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-       echo m68k-unknown-sysv4
-       exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-       echo ${UNAME_MACHINE}-unknown-amigaos
-       exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-       echo ${UNAME_MACHINE}-unknown-morphos
-       exit ;;
-    *:OS/390:*:*)
-       echo i370-ibm-openedition
-       exit ;;
-    *:z/VM:*:*)
-       echo s390-ibm-zvmoe
-       exit ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-       exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-       echo arm-acorn-riscix${UNAME_RELEASE}
-       exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-       echo arm-unknown-riscos
-       exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-       echo hppa1.1-hitachi-hiuxmpp
-       exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-       # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-       if test "`(/bin/universe) 2>/dev/null`" = att ; then
-               echo pyramid-pyramid-sysv3
-       else
-               echo pyramid-pyramid-bsd
-       fi
-       exit ;;
-    NILE*:*:*:dcosx)
-       echo pyramid-pyramid-svr4
-       exit ;;
-    DRS?6000:unix:4.0:6*)
-       echo sparc-icl-nx6
-       exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-       case `/usr/bin/uname -p` in
-           sparc) echo sparc-icl-nx7; exit ;;
-       esac ;;
-    sun4H:SunOS:5.*:*)
-       echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-       echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit ;;
-    i86pc:SunOS:5.*:*)
-       echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit ;;
-    sun4*:SunOS:6*:*)
-       # According to config.sub, this is the proper way to canonicalize
-       # SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-       # it's likely to be more like Solaris than SunOS4.
-       echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit ;;
-    sun4*:SunOS:*:*)
-       case "`/usr/bin/arch -k`" in
-           Series*|S4*)
-               UNAME_RELEASE=`uname -v`
-               ;;
-       esac
-       # Japanese Language versions have a version number like `4.1.3-JL'.
-       echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-       exit ;;
-    sun3*:SunOS:*:*)
-       echo m68k-sun-sunos${UNAME_RELEASE}
-       exit ;;
-    sun*:*:4.2BSD:*)
-       UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-       test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-       case "`/bin/arch`" in
-           sun3)
-               echo m68k-sun-sunos${UNAME_RELEASE}
-               ;;
-           sun4)
-               echo sparc-sun-sunos${UNAME_RELEASE}
-               ;;
-       esac
-       exit ;;
-    aushp:SunOS:*:*)
-       echo sparc-auspex-sunos${UNAME_RELEASE}
-       exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-       exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-       echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-       exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
-    m68k:machten:*:*)
-       echo m68k-apple-machten${UNAME_RELEASE}
-       exit ;;
-    powerpc:machten:*:*)
-       echo powerpc-apple-machten${UNAME_RELEASE}
-       exit ;;
-    RISC*:Mach:*:*)
-       echo mips-dec-mach_bsd4.3
-       exit ;;
-    RISC*:ULTRIX:*:*)
-       echo mips-dec-ultrix${UNAME_RELEASE}
-       exit ;;
-    VAX*:ULTRIX*:*:*)
-       echo vax-dec-ultrix${UNAME_RELEASE}
-       exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-       echo clipper-intergraph-clix${UNAME_RELEASE}
-       exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-       eval $set_cc_for_build
-       sed 's/^        //' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-       int main (int argc, char *argv[]) {
-#else
-       int main (argc, argv) int argc; char *argv[]; {
-#endif
-       #if defined (host_mips) && defined (MIPSEB)
-       #if defined (SYSTYPE_SYSV)
-         printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-       #endif
-       #if defined (SYSTYPE_SVR4)
-         printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-       #endif
-       #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-         printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-       #endif
-       #endif
-         exit (-1);
-       }
-EOF
-       $CC_FOR_BUILD -o $dummy $dummy.c &&
-         dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-         SYSTEM_NAME=`$dummy $dummyarg` &&
-           { echo "$SYSTEM_NAME"; exit; }
-       echo mips-mips-riscos${UNAME_RELEASE}
-       exit ;;
-    Motorola:PowerMAX_OS:*:*)
-       echo powerpc-motorola-powermax
-       exit ;;
-    Motorola:*:4.3:PL8-*)
-       echo powerpc-harris-powermax
-       exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-       echo powerpc-harris-powermax
-       exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-       echo powerpc-harris-powerunix
-       exit ;;
-    m88k:CX/UX:7*:*)
-       echo m88k-harris-cxux7
-       exit ;;
-    m88k:*:4*:R4*)
-       echo m88k-motorola-sysv4
-       exit ;;
-    m88k:*:3*:R3*)
-       echo m88k-motorola-sysv3
-       exit ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-       if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-       then
-           if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-              [ ${TARGET_BINARY_INTERFACE}x = x ]
-           then
-               echo m88k-dg-dgux${UNAME_RELEASE}
-           else
-               echo m88k-dg-dguxbcs${UNAME_RELEASE}
-           fi
-       else
-           echo i586-dg-dgux${UNAME_RELEASE}
-       fi
-       exit ;;
-    M88*:DolphinOS:*:*)        # DolphinOS (SVR3)
-       echo m88k-dolphin-sysv3
-       exit ;;
-    M88*:*:R3*:*)
-       # Delta 88k system running SVR3
-       echo m88k-motorola-sysv3
-       exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-       echo m88k-tektronix-sysv3
-       exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-       echo m68k-tektronix-bsd
-       exit ;;
-    *:IRIX*:*:*)
-       echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-       exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-       echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-       exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-       echo i386-ibm-aix
-       exit ;;
-    ia64:AIX:*:*)
-       if [ -x /usr/bin/oslevel ] ; then
-               IBM_REV=`/usr/bin/oslevel`
-       else
-               IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-       fi
-       echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-       exit ;;
-    *:AIX:2:3)
-       if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-               eval $set_cc_for_build
-               sed 's/^                //' << EOF >$dummy.c
-               #include <sys/systemcfg.h>
-
-               main()
-                       {
-                       if (!__power_pc())
-                               exit(1);
-                       puts("powerpc-ibm-aix3.2.5");
-                       exit(0);
-                       }
-EOF
-               if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-               then
-                       echo "$SYSTEM_NAME"
-               else
-                       echo rs6000-ibm-aix3.2.5
-               fi
-       elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-               echo rs6000-ibm-aix3.2.4
-       else
-               echo rs6000-ibm-aix3.2
-       fi
-       exit ;;
-    *:AIX:*:[45])
-       IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-       if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-               IBM_ARCH=rs6000
-       else
-               IBM_ARCH=powerpc
-       fi
-       if [ -x /usr/bin/oslevel ] ; then
-               IBM_REV=`/usr/bin/oslevel`
-       else
-               IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-       fi
-       echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-       exit ;;
-    *:AIX:*:*)
-       echo rs6000-ibm-aix
-       exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-       echo romp-ibm-bsd4.4
-       exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-       echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-       exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-       echo rs6000-bull-bosx
-       exit ;;
-    DPX/2?00:B.O.S.:*:*)
-       echo m68k-bull-sysv3
-       exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-       echo m68k-hp-bsd
-       exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-       echo m68k-hp-bsd4.4
-       exit ;;
-    9000/[34678]??:HP-UX:*:*)
-       HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-       case "${UNAME_MACHINE}" in
-           9000/31? )            HP_ARCH=m68000 ;;
-           9000/[34]?? )         HP_ARCH=m68k ;;
-           9000/[678][0-9][0-9])
-               if [ -x /usr/bin/getconf ]; then
-                   sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-                         '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-               fi
-               if [ "${HP_ARCH}" = "" ]; then
-                   eval $set_cc_for_build
-                   sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-               {
-               case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-               case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-               case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-                   switch (bits)
-                       {
-                       case 64: puts ("hppa2.0w"); break;
-                       case 32: puts ("hppa2.0n"); break;
-                       default: puts ("hppa2.0"); break;
-                       } break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-                   puts ("hppa2.0"); break;
-              #endif
-               default: puts ("hppa1.0"); break;
-               }
-                  exit (0);
-              }
-EOF
-                   (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-                   test -z "$HP_ARCH" && HP_ARCH=hppa
-               fi ;;
-       esac
-       if [ ${HP_ARCH} = "hppa2.0w" ]
-       then
-           eval $set_cc_for_build
-
-           # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-           # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-           # generating 64-bit code.  GNU and HP use different nomenclature:
-           #
-           # $ CC_FOR_BUILD=cc ./config.guess
-           # => hppa2.0w-hp-hpux11.23
-           # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-           # => hppa64-hp-hpux11.23
-
-           if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-               grep __LP64__ >/dev/null
-           then
-               HP_ARCH="hppa2.0w"
-           else
-               HP_ARCH="hppa64"
-           fi
-       fi
-       echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-       exit ;;
-    ia64:HP-UX:*:*)
-       HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-       echo ia64-hp-hpux${HPUX_REV}
-       exit ;;
-    3050*:HI-UX:*:*)
-       eval $set_cc_for_build
-       sed 's/^        //' << EOF >$dummy.c
-       #include <unistd.h>
-       int
-       main ()
-       {
-         long cpu = sysconf (_SC_CPU_VERSION);
-         /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-            true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-            results, however.  */
-         if (CPU_IS_PA_RISC (cpu))
-           {
-             switch (cpu)
-               {
-                 case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-                 case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-                 case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-                 default: puts ("hppa-hitachi-hiuxwe2"); break;
-               }
-           }
-         else if (CPU_IS_HP_MC68K (cpu))
-           puts ("m68k-hitachi-hiuxwe2");
-         else puts ("unknown-hitachi-hiuxwe2");
-         exit (0);
-       }
-EOF
-       $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-               { echo "$SYSTEM_NAME"; exit; }
-       echo unknown-hitachi-hiuxwe2
-       exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-       echo hppa1.1-hp-bsd
-       exit ;;
-    9000/8??:4.3bsd:*:*)
-       echo hppa1.0-hp-bsd
-       exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-       echo hppa1.0-hp-mpeix
-       exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-       echo hppa1.1-hp-osf
-       exit ;;
-    hp8??:OSF1:*:*)
-       echo hppa1.0-hp-osf
-       exit ;;
-    i*86:OSF1:*:*)
-       if [ -x /usr/sbin/sysversion ] ; then
-           echo ${UNAME_MACHINE}-unknown-osf1mk
-       else
-           echo ${UNAME_MACHINE}-unknown-osf1
-       fi
-       exit ;;
-    parisc*:Lites*:*:*)
-       echo hppa1.1-hp-lites
-       exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-       echo c1-convex-bsd
-        exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-       if getsysinfo -f scalar_acc
-       then echo c32-convex-bsd
-       else echo c2-convex-bsd
-       fi
-        exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-       echo c34-convex-bsd
-        exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-       echo c38-convex-bsd
-        exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-       echo c4-convex-bsd
-        exit ;;
-    CRAY*Y-MP:*:*:*)
-       echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit ;;
-    CRAY*[A-Z]90:*:*:*)
-       echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-       | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-             -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-             -e 's/\.[^.]*$/.X/'
-       exit ;;
-    CRAY*TS:*:*:*)
-       echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit ;;
-    CRAY*T3E:*:*:*)
-       echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit ;;
-    CRAY*SV1:*:*:*)
-       echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit ;;
-    *:UNICOS/mp:*:*)
-       echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-       FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-       exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-       echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-       exit ;;
-    sparc*:BSD/OS:*:*)
-       echo sparc-unknown-bsdi${UNAME_RELEASE}
-       exit ;;
-    *:BSD/OS:*:*)
-       echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-       exit ;;
-    *:FreeBSD:*:*)
-       echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-       exit ;;
-    i*:CYGWIN*:*)
-       echo ${UNAME_MACHINE}-pc-cygwin
-       exit ;;
-    i*:MINGW*:*)
-       echo ${UNAME_MACHINE}-pc-mingw32
-       exit ;;
-    i*:windows32*:*)
-       # uname -m includes "-pc" on this system.
-       echo ${UNAME_MACHINE}-mingw32
-       exit ;;
-    i*:PW*:*)
-       echo ${UNAME_MACHINE}-pc-pw32
-       exit ;;
-    x86:Interix*:[34]*)
-       echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-       exit ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-       echo i${UNAME_MACHINE}-pc-mks
-       exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-       # How do we know it's Interix rather than the generic POSIX subsystem?
-       # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-       # UNAME_MACHINE based on the output of uname instead of i386?
-       echo i586-pc-interix
-       exit ;;
-    i*:UWIN*:*)
-       echo ${UNAME_MACHINE}-pc-uwin
-       exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-       echo x86_64-unknown-cygwin
-       exit ;;
-    p*:CYGWIN*:*)
-       echo powerpcle-unknown-cygwin
-       exit ;;
-    prep*:SunOS:5.*:*)
-       echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit ;;
-    *:GNU:*:*)
-       # the GNU system
-       echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-       exit ;;
-    *:GNU/*:*:*)
-       # other systems with GNU libc and userland
-       echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-       exit ;;
-    i*86:Minix:*:*)
-       echo ${UNAME_MACHINE}-pc-minix
-       exit ;;
-    arm*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    cris:Linux:*:*)
-       echo cris-axis-linux-gnu
-       exit ;;
-    crisv32:Linux:*:*)
-       echo crisv32-axis-linux-gnu
-       exit ;;
-    frv:Linux:*:*)
-       echo frv-unknown-linux-gnu
-       exit ;;
-    ia64:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    m32r*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    m68*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    mips:Linux:*:*)
-       eval $set_cc_for_build
-       sed 's/^        //' << EOF >$dummy.c
-       #undef CPU
-       #undef mips
-       #undef mipsel
-       #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-       CPU=mipsel
-       #else
-       #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-       CPU=mips
-       #else
-       CPU=
-       #endif
-       #endif
-EOF
-       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-       test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-       ;;
-    mips64:Linux:*:*)
-       eval $set_cc_for_build
-       sed 's/^        //' << EOF >$dummy.c
-       #undef CPU
-       #undef mips64
-       #undef mips64el
-       #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-       CPU=mips64el
-       #else
-       #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-       CPU=mips64
-       #else
-       CPU=
-       #endif
-       #endif
-EOF
-       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-       test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-       ;;
-    or32:Linux:*:*)
-       echo or32-unknown-linux-gnu
-       exit ;;
-    ppc:Linux:*:*)
-       echo powerpc-unknown-linux-gnu
-       exit ;;
-    ppc64:Linux:*:*)
-       echo powerpc64-unknown-linux-gnu
-       exit ;;
-    alpha:Linux:*:*)
-       case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-         EV5)   UNAME_MACHINE=alphaev5 ;;
-         EV56)  UNAME_MACHINE=alphaev56 ;;
-         PCA56) UNAME_MACHINE=alphapca56 ;;
-         PCA57) UNAME_MACHINE=alphapca56 ;;
-         EV6)   UNAME_MACHINE=alphaev6 ;;
-         EV67)  UNAME_MACHINE=alphaev67 ;;
-         EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-       objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-       if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-       echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-       exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-       # Look for CPU level
-       case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-         PA7*) echo hppa1.1-unknown-linux-gnu ;;
-         PA8*) echo hppa2.0-unknown-linux-gnu ;;
-         *)    echo hppa-unknown-linux-gnu ;;
-       esac
-       exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-       echo hppa64-unknown-linux-gnu
-       exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-       echo ${UNAME_MACHINE}-ibm-linux
-       exit ;;
-    sh64*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    sh*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    x86_64:Linux:*:*)
-       echo x86_64-unknown-linux-gnu
-       exit ;;
-    i*86:Linux:*:*)
-       # The BFD linker knows what the default object file format is, so
-       # first see if it will tell us. cd to the root directory to prevent
-       # problems with other programs or directories called `ld' in the path.
-       # Set LC_ALL=C to ensure ld outputs messages in English.
-       ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-                        | sed -ne '/supported targets:/!d
-                                   s/[         ][      ]*/ /g
-                                   s/.*supported targets: *//
-                                   s/ .*//
-                                   p'`
-        case "$ld_supported_targets" in
-         elf32-i386)
-               TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-               ;;
-         a.out-i386-linux)
-               echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-               exit ;;
-         coff-i386)
-               echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-               exit ;;
-         "")
-               # Either a pre-BFD a.out linker (linux-gnuoldld) or
-               # one that does not give us useful --help.
-               echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-               exit ;;
-       esac
-       # Determine whether the default compiler is a.out or elf
-       eval $set_cc_for_build
-       sed 's/^        //' << EOF >$dummy.c
-       #include <features.h>
-       #ifdef __ELF__
-       # ifdef __GLIBC__
-       #  if __GLIBC__ >= 2
-       LIBC=gnu
-       #  else
-       LIBC=gnulibc1
-       #  endif
-       # else
-       LIBC=gnulibc1
-       # endif
-       #else
-       #ifdef __INTEL_COMPILER
-       LIBC=gnu
-       #else
-       LIBC=gnuaout
-       #endif
-       #endif
-       #ifdef __dietlibc__
-       LIBC=dietlibc
-       #endif
-EOF
-       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-       test x"${LIBC}" != x && {
-               echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-               exit
-       }
-       test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-       ;;
-    i*86:DYNIX/ptx:4*:*)
-       # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-       # earlier versions are messed up and put the nodename in both
-       # sysname and nodename.
-       echo i386-sequent-sysv4
-       exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-       # I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-       echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-       exit ;;
-    i*86:OS/2:*:*)
-       # If we were able to find `uname', then EMX Unix compatibility
-       # is probably installed.
-       echo ${UNAME_MACHINE}-pc-os2-emx
-       exit ;;
-    i*86:XTS-300:*:STOP)
-       echo ${UNAME_MACHINE}-unknown-stop
-       exit ;;
-    i*86:atheos:*:*)
-       echo ${UNAME_MACHINE}-unknown-atheos
-       exit ;;
-    i*86:syllable:*:*)
-       echo ${UNAME_MACHINE}-pc-syllable
-       exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-       echo i386-unknown-lynxos${UNAME_RELEASE}
-       exit ;;
-    i*86:*DOS:*:*)
-       echo ${UNAME_MACHINE}-pc-msdosdjgpp
-       exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-       UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-       if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-               echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-       else
-               echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-       fi
-       exit ;;
-    i*86:*:5:[678]*)
-       # UnixWare 7.x, OpenUNIX and OpenServer 6.
-       case `/bin/uname -X | grep "^Machine"` in
-           *486*)           UNAME_MACHINE=i486 ;;
-           *Pentium)        UNAME_MACHINE=i586 ;;
-           *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-       esac
-       echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-       exit ;;
-    i*86:*:3.2:*)
-       if test -f /usr/options/cb.name; then
-               UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-               echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-       elif /bin/uname -X 2>/dev/null >/dev/null ; then
-               UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-               (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-               (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-                       && UNAME_MACHINE=i586
-               (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-                       && UNAME_MACHINE=i686
-               (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-                       && UNAME_MACHINE=i686
-               echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-       else
-               echo ${UNAME_MACHINE}-pc-sysv32
-       fi
-       exit ;;
-    pc:*:*:*)
-       # Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-       echo i386-pc-msdosdjgpp
-        exit ;;
-    Intel:Mach:3*:*)
-       echo i386-pc-mach3
-       exit ;;
-    paragon:*:*:*)
-       echo i860-intel-osf1
-       exit ;;
-    i860:*:4.*:*) # i860-SVR4
-       if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-         echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-       else # Add other i860-SVR4 vendors below as they are discovered.
-         echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-       fi
-       exit ;;
-    mini*:CTIX:SYS*5:*)
-       # "miniframe"
-       echo m68010-convergent-sysv
-       exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-       echo m68k-convergent-sysv
-       exit ;;
-    M680?0:D-NIX:5.3:*)
-       echo m68k-diab-dnix
-       exit ;;
-    M68*:*:R3V[5678]*:*)
-       test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-       OS_REL=''
-       test -r /etc/.relid \
-       && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-       /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-         && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-       /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-         && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-       echo m68k-unknown-lynxos${UNAME_RELEASE}
-       exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-       echo m68k-atari-sysv4
-       exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-       echo sparc-unknown-lynxos${UNAME_RELEASE}
-       exit ;;
-    rs6000:LynxOS:2.*:*)
-       echo rs6000-unknown-lynxos${UNAME_RELEASE}
-       exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-       echo powerpc-unknown-lynxos${UNAME_RELEASE}
-       exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-       echo mips-dde-sysv${UNAME_RELEASE}
-       exit ;;
-    RM*:ReliantUNIX-*:*:*)
-       echo mips-sni-sysv4
-       exit ;;
-    RM*:SINIX-*:*:*)
-       echo mips-sni-sysv4
-       exit ;;
-    *:SINIX-*:*:*)
-       if uname -p 2>/dev/null >/dev/null ; then
-               UNAME_MACHINE=`(uname -p) 2>/dev/null`
-               echo ${UNAME_MACHINE}-sni-sysv4
-       else
-               echo ns32k-sni-sysv
-       fi
-       exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
-    *:UNIX_System_V:4*:FTX*)
-       # From Gerald Hewes <hewes@openmarket.com>.
-       # How about differentiating between stratus architectures? -djm
-       echo hppa1.1-stratus-sysv4
-       exit ;;
-    *:*:*:FTX*)
-       # From seanf@swdc.stratus.com.
-       echo i860-stratus-sysv4
-       exit ;;
-    i*86:VOS:*:*)
-       # From Paul.Green@stratus.com.
-       echo ${UNAME_MACHINE}-stratus-vos
-       exit ;;
-    *:VOS:*:*)
-       # From Paul.Green@stratus.com.
-       echo hppa1.1-stratus-vos
-       exit ;;
-    mc68*:A/UX:*:*)
-       echo m68k-apple-aux${UNAME_RELEASE}
-       exit ;;
-    news*:NEWS-OS:6*:*)
-       echo mips-sony-newsos6
-       exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-       if [ -d /usr/nec ]; then
-               echo mips-nec-sysv${UNAME_RELEASE}
-       else
-               echo mips-unknown-sysv${UNAME_RELEASE}
-       fi
-        exit ;;
-    BeBox:BeOS:*:*)    # BeOS running on hardware made by Be, PPC only.
-       echo powerpc-be-beos
-       exit ;;
-    BeMac:BeOS:*:*)    # BeOS running on Mac or Mac clone, PPC only.
-       echo powerpc-apple-beos
-       exit ;;
-    BePC:BeOS:*:*)     # BeOS running on Intel PC compatible.
-       echo i586-pc-beos
-       exit ;;
-    SX-4:SUPER-UX:*:*)
-       echo sx4-nec-superux${UNAME_RELEASE}
-       exit ;;
-    SX-5:SUPER-UX:*:*)
-       echo sx5-nec-superux${UNAME_RELEASE}
-       exit ;;
-    SX-6:SUPER-UX:*:*)
-       echo sx6-nec-superux${UNAME_RELEASE}
-       exit ;;
-    Power*:Rhapsody:*:*)
-       echo powerpc-apple-rhapsody${UNAME_RELEASE}
-       exit ;;
-    *:Rhapsody:*:*)
-       echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-       exit ;;
-    *:Darwin:*:*)
-       UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-       case $UNAME_PROCESSOR in
-           *86) UNAME_PROCESSOR=i686 ;;
-           unknown) UNAME_PROCESSOR=powerpc ;;
-       esac
-       echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-       exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-       UNAME_PROCESSOR=`uname -p`
-       if test "$UNAME_PROCESSOR" = "x86"; then
-               UNAME_PROCESSOR=i386
-               UNAME_MACHINE=pc
-       fi
-       echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-       exit ;;
-    *:QNX:*:4*)
-       echo i386-pc-qnx
-       exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-       echo nse-tandem-nsk${UNAME_RELEASE}
-       exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-       echo nsr-tandem-nsk${UNAME_RELEASE}
-       exit ;;
-    *:NonStop-UX:*:*)
-       echo mips-compaq-nonstopux
-       exit ;;
-    BS2000:POSIX*:*:*)
-       echo bs2000-siemens-sysv
-       exit ;;
-    DS/*:UNIX_System_V:*:*)
-       echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-       exit ;;
-    *:Plan9:*:*)
-       # "uname -m" is not consistent, so use $cputype instead. 386
-       # is converted to i386 for consistency with other x86
-       # operating systems.
-       if test "$cputype" = "386"; then
-           UNAME_MACHINE=i386
-       else
-           UNAME_MACHINE="$cputype"
-       fi
-       echo ${UNAME_MACHINE}-unknown-plan9
-       exit ;;
-    *:TOPS-10:*:*)
-       echo pdp10-unknown-tops10
-       exit ;;
-    *:TENEX:*:*)
-       echo pdp10-unknown-tenex
-       exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-       echo pdp10-dec-tops20
-       exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-       echo pdp10-xkl-tops20
-       exit ;;
-    *:TOPS-20:*:*)
-       echo pdp10-unknown-tops20
-       exit ;;
-    *:ITS:*:*)
-       echo pdp10-unknown-its
-       exit ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-       exit ;;
-    *:DragonFly:*:*)
-       echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-       exit ;;
-    *:*VMS:*:*)
-       UNAME_MACHINE=`(uname -p) 2>/dev/null`
-       case "${UNAME_MACHINE}" in
-           A*) echo alpha-dec-vms ; exit ;;
-           I*) echo ia64-dec-vms ; exit ;;
-           V*) echo vax-dec-vms ; exit ;;
-       esac ;;
-    *:XENIX:*:SysV)
-       echo i386-pc-xenix
-       exit ;;
-    i*86:skyos:*:*)
-       echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-       exit ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-         ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-       printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-       printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-       { echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-       echo c1-convex-bsd
-       exit ;;
-    c2*)
-       if getsysinfo -f scalar_acc
-       then echo c32-convex-bsd
-       else echo c2-convex-bsd
-       fi
-       exit ;;
-    c34*)
-       echo c34-convex-bsd
-       exit ;;
-    c38*)
-       echo c38-convex-bsd
-       exit ;;
-    c4*)
-       echo c4-convex-bsd
-       exit ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
-and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/experimental/modest/config.h.in b/experimental/modest/config.h.in
deleted file mode 100644 (file)
index 09e3446..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Enable GConf */
-#undef MODEST_ENABLE_GCONF
-
-/* Enable Plain Gtk+ UI */
-#undef MODEST_ENABLE_GTK_UI
-
-/* Enable Hildon UI */
-#undef MODEST_ENABLE_HILDON_UI
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
diff --git a/experimental/modest/config.sub b/experimental/modest/config.sub
deleted file mode 100755 (executable)
index 1c366df..0000000
+++ /dev/null
@@ -1,1579 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-timestamp='2005-07-08'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#      CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#      CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )        # Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-       -sun*os*)
-               # Prevent following clause from handling this invalid input.
-               ;;
-       -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-       -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-       -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-       -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-       -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-       -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-       -apple | -axis | -knuth | -cray)
-               os=
-               basic_machine=$1
-               ;;
-       -sim | -cisco | -oki | -wec | -winbond)
-               os=
-               basic_machine=$1
-               ;;
-       -scout)
-               ;;
-       -wrs)
-               os=-vxworks
-               basic_machine=$1
-               ;;
-       -chorusos*)
-               os=-chorusos
-               basic_machine=$1
-               ;;
-       -chorusrdb)
-               os=-chorusrdb
-               basic_machine=$1
-               ;;
-       -hiux*)
-               os=-hiuxwe2
-               ;;
-       -sco5)
-               os=-sco3.2v5
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -sco4)
-               os=-sco3.2v4
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -sco3.2.[4-9]*)
-               os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -sco3.2v[4-9]*)
-               # Don't forget version if it is 3.2v4 or newer.
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -sco*)
-               os=-sco3.2v2
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -udk*)
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -isc)
-               os=-isc2.2
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -clix*)
-               basic_machine=clipper-intergraph
-               ;;
-       -isc*)
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -lynx*)
-               os=-lynxos
-               ;;
-       -ptx*)
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-               ;;
-       -windowsnt*)
-               os=`echo $os | sed -e 's/windowsnt/winnt/'`
-               ;;
-       -psos*)
-               os=-psos
-               ;;
-       -mint | -mint[0-9]*)
-               basic_machine=m68k-atari
-               os=-mint
-               ;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-       # Recognize the basic CPU types without company name.
-       # Some are omitted here because they have special meanings below.
-       1750a | 580 \
-       | a29k \
-       | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-       | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-       | am33_2.0 \
-       | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-       | bfin \
-       | c4x | clipper \
-       | d10v | d30v | dlx | dsp16xx \
-       | fr30 | frv \
-       | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-       | i370 | i860 | i960 | ia64 \
-       | ip2k | iq2000 \
-       | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
-       | mips | mipsbe | mipseb | mipsel | mipsle \
-       | mips16 \
-       | mips64 | mips64el \
-       | mips64vr | mips64vrel \
-       | mips64orion | mips64orionel \
-       | mips64vr4100 | mips64vr4100el \
-       | mips64vr4300 | mips64vr4300el \
-       | mips64vr5000 | mips64vr5000el \
-       | mips64vr5900 | mips64vr5900el \
-       | mipsisa32 | mipsisa32el \
-       | mipsisa32r2 | mipsisa32r2el \
-       | mipsisa64 | mipsisa64el \
-       | mipsisa64r2 | mipsisa64r2el \
-       | mipsisa64sb1 | mipsisa64sb1el \
-       | mipsisa64sr71k | mipsisa64sr71kel \
-       | mipstx39 | mipstx39el \
-       | mn10200 | mn10300 \
-       | ms1 \
-       | msp430 \
-       | ns16k | ns32k \
-       | or32 \
-       | pdp10 | pdp11 | pj | pjl \
-       | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-       | pyramid \
-       | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-       | sh64 | sh64le \
-       | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-       | sparcv8 | sparcv9 | sparcv9b \
-       | strongarm \
-       | tahoe | thumb | tic4x | tic80 | tron \
-       | v850 | v850e \
-       | we32k \
-       | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-       | z8k)
-               basic_machine=$basic_machine-unknown
-               ;;
-       m32c)
-               basic_machine=$basic_machine-unknown
-               ;;
-       m6811 | m68hc11 | m6812 | m68hc12)
-               # Motorola 68HC11/12.
-               basic_machine=$basic_machine-unknown
-               os=-none
-               ;;
-       m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-               ;;
-
-       # We use `pc' rather than `unknown'
-       # because (1) that's what they normally are, and
-       # (2) the word "unknown" tends to confuse beginning users.
-       i*86 | x86_64)
-         basic_machine=$basic_machine-pc
-         ;;
-       # Object if more than one company name word.
-       *-*-*)
-               echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-               exit 1
-               ;;
-       # Recognize the basic CPU types with company name.
-       580-* \
-       | a29k-* \
-       | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-       | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-       | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-       | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-       | avr-* \
-       | bfin-* | bs2000-* \
-       | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-       | clipper-* | craynv-* | cydra-* \
-       | d10v-* | d30v-* | dlx-* \
-       | elxsi-* \
-       | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-       | h8300-* | h8500-* \
-       | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-       | i*86-* | i860-* | i960-* | ia64-* \
-       | ip2k-* | iq2000-* \
-       | m32r-* | m32rle-* \
-       | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-       | m88110-* | m88k-* | maxq-* | mcore-* \
-       | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-       | mips16-* \
-       | mips64-* | mips64el-* \
-       | mips64vr-* | mips64vrel-* \
-       | mips64orion-* | mips64orionel-* \
-       | mips64vr4100-* | mips64vr4100el-* \
-       | mips64vr4300-* | mips64vr4300el-* \
-       | mips64vr5000-* | mips64vr5000el-* \
-       | mips64vr5900-* | mips64vr5900el-* \
-       | mipsisa32-* | mipsisa32el-* \
-       | mipsisa32r2-* | mipsisa32r2el-* \
-       | mipsisa64-* | mipsisa64el-* \
-       | mipsisa64r2-* | mipsisa64r2el-* \
-       | mipsisa64sb1-* | mipsisa64sb1el-* \
-       | mipsisa64sr71k-* | mipsisa64sr71kel-* \
-       | mipstx39-* | mipstx39el-* \
-       | mmix-* \
-       | ms1-* \
-       | msp430-* \
-       | none-* | np1-* | ns16k-* | ns32k-* \
-       | orion-* \
-       | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-       | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-       | pyramid-* \
-       | romp-* | rs6000-* \
-       | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-       | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-       | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
-       | sparclite-* \
-       | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-       | tahoe-* | thumb-* \
-       | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-       | tron-* \
-       | v850-* | v850e-* | vax-* \
-       | we32k-* \
-       | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-       | xstormy16-* | xtensa-* \
-       | ymp-* \
-       | z8k-*)
-               ;;
-       m32c-*)
-               ;;
-       # Recognize the various machine names and aliases which stand
-       # for a CPU type and a company and sometimes even an OS.
-       386bsd)
-               basic_machine=i386-unknown
-               os=-bsd
-               ;;
-       3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-               basic_machine=m68000-att
-               ;;
-       3b*)
-               basic_machine=we32k-att
-               ;;
-       a29khif)
-               basic_machine=a29k-amd
-               os=-udi
-               ;;
-       abacus)
-               basic_machine=abacus-unknown
-               ;;
-       adobe68k)
-               basic_machine=m68010-adobe
-               os=-scout
-               ;;
-       alliant | fx80)
-               basic_machine=fx80-alliant
-               ;;
-       altos | altos3068)
-               basic_machine=m68k-altos
-               ;;
-       am29k)
-               basic_machine=a29k-none
-               os=-bsd
-               ;;
-       amd64)
-               basic_machine=x86_64-pc
-               ;;
-       amd64-*)
-               basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       amdahl)
-               basic_machine=580-amdahl
-               os=-sysv
-               ;;
-       amiga | amiga-*)
-               basic_machine=m68k-unknown
-               ;;
-       amigaos | amigados)
-               basic_machine=m68k-unknown
-               os=-amigaos
-               ;;
-       amigaunix | amix)
-               basic_machine=m68k-unknown
-               os=-sysv4
-               ;;
-       apollo68)
-               basic_machine=m68k-apollo
-               os=-sysv
-               ;;
-       apollo68bsd)
-               basic_machine=m68k-apollo
-               os=-bsd
-               ;;
-       aux)
-               basic_machine=m68k-apple
-               os=-aux
-               ;;
-       balance)
-               basic_machine=ns32k-sequent
-               os=-dynix
-               ;;
-       c90)
-               basic_machine=c90-cray
-               os=-unicos
-               ;;
-       convex-c1)
-               basic_machine=c1-convex
-               os=-bsd
-               ;;
-       convex-c2)
-               basic_machine=c2-convex
-               os=-bsd
-               ;;
-       convex-c32)
-               basic_machine=c32-convex
-               os=-bsd
-               ;;
-       convex-c34)
-               basic_machine=c34-convex
-               os=-bsd
-               ;;
-       convex-c38)
-               basic_machine=c38-convex
-               os=-bsd
-               ;;
-       cray | j90)
-               basic_machine=j90-cray
-               os=-unicos
-               ;;
-       craynv)
-               basic_machine=craynv-cray
-               os=-unicosmp
-               ;;
-       cr16c)
-               basic_machine=cr16c-unknown
-               os=-elf
-               ;;
-       crds | unos)
-               basic_machine=m68k-crds
-               ;;
-       crisv32 | crisv32-* | etraxfs*)
-               basic_machine=crisv32-axis
-               ;;
-       cris | cris-* | etrax*)
-               basic_machine=cris-axis
-               ;;
-       crx)
-               basic_machine=crx-unknown
-               os=-elf
-               ;;
-       da30 | da30-*)
-               basic_machine=m68k-da30
-               ;;
-       decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-               basic_machine=mips-dec
-               ;;
-       decsystem10* | dec10*)
-               basic_machine=pdp10-dec
-               os=-tops10
-               ;;
-       decsystem20* | dec20*)
-               basic_machine=pdp10-dec
-               os=-tops20
-               ;;
-       delta | 3300 | motorola-3300 | motorola-delta \
-             | 3300-motorola | delta-motorola)
-               basic_machine=m68k-motorola
-               ;;
-       delta88)
-               basic_machine=m88k-motorola
-               os=-sysv3
-               ;;
-       djgpp)
-               basic_machine=i586-pc
-               os=-msdosdjgpp
-               ;;
-       dpx20 | dpx20-*)
-               basic_machine=rs6000-bull
-               os=-bosx
-               ;;
-       dpx2* | dpx2*-bull)
-               basic_machine=m68k-bull
-               os=-sysv3
-               ;;
-       ebmon29k)
-               basic_machine=a29k-amd
-               os=-ebmon
-               ;;
-       elxsi)
-               basic_machine=elxsi-elxsi
-               os=-bsd
-               ;;
-       encore | umax | mmax)
-               basic_machine=ns32k-encore
-               ;;
-       es1800 | OSE68k | ose68k | ose | OSE)
-               basic_machine=m68k-ericsson
-               os=-ose
-               ;;
-       fx2800)
-               basic_machine=i860-alliant
-               ;;
-       genix)
-               basic_machine=ns32k-ns
-               ;;
-       gmicro)
-               basic_machine=tron-gmicro
-               os=-sysv
-               ;;
-       go32)
-               basic_machine=i386-pc
-               os=-go32
-               ;;
-       h3050r* | hiux*)
-               basic_machine=hppa1.1-hitachi
-               os=-hiuxwe2
-               ;;
-       h8300hms)
-               basic_machine=h8300-hitachi
-               os=-hms
-               ;;
-       h8300xray)
-               basic_machine=h8300-hitachi
-               os=-xray
-               ;;
-       h8500hms)
-               basic_machine=h8500-hitachi
-               os=-hms
-               ;;
-       harris)
-               basic_machine=m88k-harris
-               os=-sysv3
-               ;;
-       hp300-*)
-               basic_machine=m68k-hp
-               ;;
-       hp300bsd)
-               basic_machine=m68k-hp
-               os=-bsd
-               ;;
-       hp300hpux)
-               basic_machine=m68k-hp
-               os=-hpux
-               ;;
-       hp3k9[0-9][0-9] | hp9[0-9][0-9])
-               basic_machine=hppa1.0-hp
-               ;;
-       hp9k2[0-9][0-9] | hp9k31[0-9])
-               basic_machine=m68000-hp
-               ;;
-       hp9k3[2-9][0-9])
-               basic_machine=m68k-hp
-               ;;
-       hp9k6[0-9][0-9] | hp6[0-9][0-9])
-               basic_machine=hppa1.0-hp
-               ;;
-       hp9k7[0-79][0-9] | hp7[0-79][0-9])
-               basic_machine=hppa1.1-hp
-               ;;
-       hp9k78[0-9] | hp78[0-9])
-               # FIXME: really hppa2.0-hp
-               basic_machine=hppa1.1-hp
-               ;;
-       hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-               # FIXME: really hppa2.0-hp
-               basic_machine=hppa1.1-hp
-               ;;
-       hp9k8[0-9][13679] | hp8[0-9][13679])
-               basic_machine=hppa1.1-hp
-               ;;
-       hp9k8[0-9][0-9] | hp8[0-9][0-9])
-               basic_machine=hppa1.0-hp
-               ;;
-       hppa-next)
-               os=-nextstep3
-               ;;
-       hppaosf)
-               basic_machine=hppa1.1-hp
-               os=-osf
-               ;;
-       hppro)
-               basic_machine=hppa1.1-hp
-               os=-proelf
-               ;;
-       i370-ibm* | ibm*)
-               basic_machine=i370-ibm
-               ;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-       i*86v32)
-               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-               os=-sysv32
-               ;;
-       i*86v4*)
-               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-               os=-sysv4
-               ;;
-       i*86v)
-               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-               os=-sysv
-               ;;
-       i*86sol2)
-               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-               os=-solaris2
-               ;;
-       i386mach)
-               basic_machine=i386-mach
-               os=-mach
-               ;;
-       i386-vsta | vsta)
-               basic_machine=i386-unknown
-               os=-vsta
-               ;;
-       iris | iris4d)
-               basic_machine=mips-sgi
-               case $os in
-                   -irix*)
-                       ;;
-                   *)
-                       os=-irix4
-                       ;;
-               esac
-               ;;
-       isi68 | isi)
-               basic_machine=m68k-isi
-               os=-sysv
-               ;;
-       m88k-omron*)
-               basic_machine=m88k-omron
-               ;;
-       magnum | m3230)
-               basic_machine=mips-mips
-               os=-sysv
-               ;;
-       merlin)
-               basic_machine=ns32k-utek
-               os=-sysv
-               ;;
-       mingw32)
-               basic_machine=i386-pc
-               os=-mingw32
-               ;;
-       miniframe)
-               basic_machine=m68000-convergent
-               ;;
-       *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-               basic_machine=m68k-atari
-               os=-mint
-               ;;
-       mips3*-*)
-               basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-               ;;
-       mips3*)
-               basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-               ;;
-       monitor)
-               basic_machine=m68k-rom68k
-               os=-coff
-               ;;
-       morphos)
-               basic_machine=powerpc-unknown
-               os=-morphos
-               ;;
-       msdos)
-               basic_machine=i386-pc
-               os=-msdos
-               ;;
-       mvs)
-               basic_machine=i370-ibm
-               os=-mvs
-               ;;
-       ncr3000)
-               basic_machine=i486-ncr
-               os=-sysv4
-               ;;
-       netbsd386)
-               basic_machine=i386-unknown
-               os=-netbsd
-               ;;
-       netwinder)
-               basic_machine=armv4l-rebel
-               os=-linux
-               ;;
-       news | news700 | news800 | news900)
-               basic_machine=m68k-sony
-               os=-newsos
-               ;;
-       news1000)
-               basic_machine=m68030-sony
-               os=-newsos
-               ;;
-       news-3600 | risc-news)
-               basic_machine=mips-sony
-               os=-newsos
-               ;;
-       necv70)
-               basic_machine=v70-nec
-               os=-sysv
-               ;;
-       next | m*-next )
-               basic_machine=m68k-next
-               case $os in
-                   -nextstep* )
-                       ;;
-                   -ns2*)
-                     os=-nextstep2
-                       ;;
-                   *)
-                     os=-nextstep3
-                       ;;
-               esac
-               ;;
-       nh3000)
-               basic_machine=m68k-harris
-               os=-cxux
-               ;;
-       nh[45]000)
-               basic_machine=m88k-harris
-               os=-cxux
-               ;;
-       nindy960)
-               basic_machine=i960-intel
-               os=-nindy
-               ;;
-       mon960)
-               basic_machine=i960-intel
-               os=-mon960
-               ;;
-       nonstopux)
-               basic_machine=mips-compaq
-               os=-nonstopux
-               ;;
-       np1)
-               basic_machine=np1-gould
-               ;;
-       nsr-tandem)
-               basic_machine=nsr-tandem
-               ;;
-       op50n-* | op60c-*)
-               basic_machine=hppa1.1-oki
-               os=-proelf
-               ;;
-       openrisc | openrisc-*)
-               basic_machine=or32-unknown
-               ;;
-       os400)
-               basic_machine=powerpc-ibm
-               os=-os400
-               ;;
-       OSE68000 | ose68000)
-               basic_machine=m68000-ericsson
-               os=-ose
-               ;;
-       os68k)
-               basic_machine=m68k-none
-               os=-os68k
-               ;;
-       pa-hitachi)
-               basic_machine=hppa1.1-hitachi
-               os=-hiuxwe2
-               ;;
-       paragon)
-               basic_machine=i860-intel
-               os=-osf
-               ;;
-       pbd)
-               basic_machine=sparc-tti
-               ;;
-       pbb)
-               basic_machine=m68k-tti
-               ;;
-       pc532 | pc532-*)
-               basic_machine=ns32k-pc532
-               ;;
-       pentium | p5 | k5 | k6 | nexgen | viac3)
-               basic_machine=i586-pc
-               ;;
-       pentiumpro | p6 | 6x86 | athlon | athlon_*)
-               basic_machine=i686-pc
-               ;;
-       pentiumii | pentium2 | pentiumiii | pentium3)
-               basic_machine=i686-pc
-               ;;
-       pentium4)
-               basic_machine=i786-pc
-               ;;
-       pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-               basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       pentiumpro-* | p6-* | 6x86-* | athlon-*)
-               basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-               basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       pentium4-*)
-               basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       pn)
-               basic_machine=pn-gould
-               ;;
-       power)  basic_machine=power-ibm
-               ;;
-       ppc)    basic_machine=powerpc-unknown
-               ;;
-       ppc-*)  basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       ppcle | powerpclittle | ppc-le | powerpc-little)
-               basic_machine=powerpcle-unknown
-               ;;
-       ppcle-* | powerpclittle-*)
-               basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       ppc64)  basic_machine=powerpc64-unknown
-               ;;
-       ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-               basic_machine=powerpc64le-unknown
-               ;;
-       ppc64le-* | powerpc64little-*)
-               basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       ps2)
-               basic_machine=i386-ibm
-               ;;
-       pw32)
-               basic_machine=i586-unknown
-               os=-pw32
-               ;;
-       rom68k)
-               basic_machine=m68k-rom68k
-               os=-coff
-               ;;
-       rm[46]00)
-               basic_machine=mips-siemens
-               ;;
-       rtpc | rtpc-*)
-               basic_machine=romp-ibm
-               ;;
-       s390 | s390-*)
-               basic_machine=s390-ibm
-               ;;
-       s390x | s390x-*)
-               basic_machine=s390x-ibm
-               ;;
-       sa29200)
-               basic_machine=a29k-amd
-               os=-udi
-               ;;
-       sb1)
-               basic_machine=mipsisa64sb1-unknown
-               ;;
-       sb1el)
-               basic_machine=mipsisa64sb1el-unknown
-               ;;
-       sei)
-               basic_machine=mips-sei
-               os=-seiux
-               ;;
-       sequent)
-               basic_machine=i386-sequent
-               ;;
-       sh)
-               basic_machine=sh-hitachi
-               os=-hms
-               ;;
-       sh64)
-               basic_machine=sh64-unknown
-               ;;
-       sparclite-wrs | simso-wrs)
-               basic_machine=sparclite-wrs
-               os=-vxworks
-               ;;
-       sps7)
-               basic_machine=m68k-bull
-               os=-sysv2
-               ;;
-       spur)
-               basic_machine=spur-unknown
-               ;;
-       st2000)
-               basic_machine=m68k-tandem
-               ;;
-       stratus)
-               basic_machine=i860-stratus
-               os=-sysv4
-               ;;
-       sun2)
-               basic_machine=m68000-sun
-               ;;
-       sun2os3)
-               basic_machine=m68000-sun
-               os=-sunos3
-               ;;
-       sun2os4)
-               basic_machine=m68000-sun
-               os=-sunos4
-               ;;
-       sun3os3)
-               basic_machine=m68k-sun
-               os=-sunos3
-               ;;
-       sun3os4)
-               basic_machine=m68k-sun
-               os=-sunos4
-               ;;
-       sun4os3)
-               basic_machine=sparc-sun
-               os=-sunos3
-               ;;
-       sun4os4)
-               basic_machine=sparc-sun
-               os=-sunos4
-               ;;
-       sun4sol2)
-               basic_machine=sparc-sun
-               os=-solaris2
-               ;;
-       sun3 | sun3-*)
-               basic_machine=m68k-sun
-               ;;
-       sun4)
-               basic_machine=sparc-sun
-               ;;
-       sun386 | sun386i | roadrunner)
-               basic_machine=i386-sun
-               ;;
-       sv1)
-               basic_machine=sv1-cray
-               os=-unicos
-               ;;
-       symmetry)
-               basic_machine=i386-sequent
-               os=-dynix
-               ;;
-       t3e)
-               basic_machine=alphaev5-cray
-               os=-unicos
-               ;;
-       t90)
-               basic_machine=t90-cray
-               os=-unicos
-               ;;
-       tic54x | c54x*)
-               basic_machine=tic54x-unknown
-               os=-coff
-               ;;
-       tic55x | c55x*)
-               basic_machine=tic55x-unknown
-               os=-coff
-               ;;
-       tic6x | c6x*)
-               basic_machine=tic6x-unknown
-               os=-coff
-               ;;
-       tx39)
-               basic_machine=mipstx39-unknown
-               ;;
-       tx39el)
-               basic_machine=mipstx39el-unknown
-               ;;
-       toad1)
-               basic_machine=pdp10-xkl
-               os=-tops20
-               ;;
-       tower | tower-32)
-               basic_machine=m68k-ncr
-               ;;
-       tpf)
-               basic_machine=s390x-ibm
-               os=-tpf
-               ;;
-       udi29k)
-               basic_machine=a29k-amd
-               os=-udi
-               ;;
-       ultra3)
-               basic_machine=a29k-nyu
-               os=-sym1
-               ;;
-       v810 | necv810)
-               basic_machine=v810-nec
-               os=-none
-               ;;
-       vaxv)
-               basic_machine=vax-dec
-               os=-sysv
-               ;;
-       vms)
-               basic_machine=vax-dec
-               os=-vms
-               ;;
-       vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
-       vxworks960)
-               basic_machine=i960-wrs
-               os=-vxworks
-               ;;
-       vxworks68)
-               basic_machine=m68k-wrs
-               os=-vxworks
-               ;;
-       vxworks29k)
-               basic_machine=a29k-wrs
-               os=-vxworks
-               ;;
-       w65*)
-               basic_machine=w65-wdc
-               os=-none
-               ;;
-       w89k-*)
-               basic_machine=hppa1.1-winbond
-               os=-proelf
-               ;;
-       xbox)
-               basic_machine=i686-pc
-               os=-mingw32
-               ;;
-       xps | xps100)
-               basic_machine=xps100-honeywell
-               ;;
-       ymp)
-               basic_machine=ymp-cray
-               os=-unicos
-               ;;
-       z8k-*-coff)
-               basic_machine=z8k-unknown
-               os=-sim
-               ;;
-       none)
-               basic_machine=none-none
-               os=-none
-               ;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-       w89k)
-               basic_machine=hppa1.1-winbond
-               ;;
-       op50n)
-               basic_machine=hppa1.1-oki
-               ;;
-       op60c)
-               basic_machine=hppa1.1-oki
-               ;;
-       romp)
-               basic_machine=romp-ibm
-               ;;
-       mmix)
-               basic_machine=mmix-knuth
-               ;;
-       rs6000)
-               basic_machine=rs6000-ibm
-               ;;
-       vax)
-               basic_machine=vax-dec
-               ;;
-       pdp10)
-               # there are many clones, so DEC is not a safe bet
-               basic_machine=pdp10-unknown
-               ;;
-       pdp11)
-               basic_machine=pdp11-dec
-               ;;
-       we32k)
-               basic_machine=we32k-att
-               ;;
-       sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
-               basic_machine=sh-unknown
-               ;;
-       sparc | sparcv8 | sparcv9 | sparcv9b)
-               basic_machine=sparc-sun
-               ;;
-       cydra)
-               basic_machine=cydra-cydrome
-               ;;
-       orion)
-               basic_machine=orion-highlevel
-               ;;
-       orion105)
-               basic_machine=clipper-highlevel
-               ;;
-       mac | mpw | mac-mpw)
-               basic_machine=m68k-apple
-               ;;
-       pmac | pmac-mpw)
-               basic_machine=powerpc-apple
-               ;;
-       *-unknown)
-               # Make sure to match an already-canonicalized machine name.
-               ;;
-       *)
-               echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-               exit 1
-               ;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-       *-digital*)
-               basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-               ;;
-       *-commodore*)
-               basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-               ;;
-       *)
-               ;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-       # -solaris* is a basic system type, with this one exception.
-       -solaris1 | -solaris1.*)
-               os=`echo $os | sed -e 's|solaris1|sunos4|'`
-               ;;
-       -solaris)
-               os=-solaris2
-               ;;
-       -svr4*)
-               os=-sysv4
-               ;;
-       -unixware*)
-               os=-sysv4.2uw
-               ;;
-       -gnu/linux*)
-               os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-               ;;
-       # First accept the basic system types.
-       # The portable systems comes first.
-       # Each alternative MUST END IN A *, to match a version number.
-       # -sysv* is not here because it comes later, after sysvr4.
-       -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-             | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-             | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-             | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-             | -aos* \
-             | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-             | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-             | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-             | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-             | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-             | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-             | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-             | -chorusos* | -chorusrdb* \
-             | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-             | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-             | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-             | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-             | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-             | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-             | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-             | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-             | -skyos* | -haiku*)
-       # Remember, each alternative MUST END IN *, to match a version number.
-               ;;
-       -qnx*)
-               case $basic_machine in
-                   x86-* | i*86-*)
-                       ;;
-                   *)
-                       os=-nto$os
-                       ;;
-               esac
-               ;;
-       -nto-qnx*)
-               ;;
-       -nto*)
-               os=`echo $os | sed -e 's|nto|nto-qnx|'`
-               ;;
-       -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-             | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-             | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-               ;;
-       -mac*)
-               os=`echo $os | sed -e 's|mac|macos|'`
-               ;;
-       -linux-dietlibc)
-               os=-linux-dietlibc
-               ;;
-       -linux*)
-               os=`echo $os | sed -e 's|linux|linux-gnu|'`
-               ;;
-       -sunos5*)
-               os=`echo $os | sed -e 's|sunos5|solaris2|'`
-               ;;
-       -sunos6*)
-               os=`echo $os | sed -e 's|sunos6|solaris3|'`
-               ;;
-       -opened*)
-               os=-openedition
-               ;;
-        -os400*)
-               os=-os400
-               ;;
-       -wince*)
-               os=-wince
-               ;;
-       -osfrose*)
-               os=-osfrose
-               ;;
-       -osf*)
-               os=-osf
-               ;;
-       -utek*)
-               os=-bsd
-               ;;
-       -dynix*)
-               os=-bsd
-               ;;
-       -acis*)
-               os=-aos
-               ;;
-       -atheos*)
-               os=-atheos
-               ;;
-       -syllable*)
-               os=-syllable
-               ;;
-       -386bsd)
-               os=-bsd
-               ;;
-       -ctix* | -uts*)
-               os=-sysv
-               ;;
-       -nova*)
-               os=-rtmk-nova
-               ;;
-       -ns2 )
-               os=-nextstep2
-               ;;
-       -nsk*)
-               os=-nsk
-               ;;
-       # Preserve the version number of sinix5.
-       -sinix5.*)
-               os=`echo $os | sed -e 's|sinix|sysv|'`
-               ;;
-       -sinix*)
-               os=-sysv4
-               ;;
-        -tpf*)
-               os=-tpf
-               ;;
-       -triton*)
-               os=-sysv3
-               ;;
-       -oss*)
-               os=-sysv3
-               ;;
-       -svr4)
-               os=-sysv4
-               ;;
-       -svr3)
-               os=-sysv3
-               ;;
-       -sysvr4)
-               os=-sysv4
-               ;;
-       # This must come after -sysvr4.
-       -sysv*)
-               ;;
-       -ose*)
-               os=-ose
-               ;;
-       -es1800*)
-               os=-ose
-               ;;
-       -xenix)
-               os=-xenix
-               ;;
-       -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-               os=-mint
-               ;;
-       -aros*)
-               os=-aros
-               ;;
-       -kaos*)
-               os=-kaos
-               ;;
-       -zvmoe)
-               os=-zvmoe
-               ;;
-       -none)
-               ;;
-       *)
-               # Get rid of the `-' at the beginning of $os.
-               os=`echo $os | sed 's/[^-]*-//'`
-               echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-               exit 1
-               ;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-       *-acorn)
-               os=-riscix1.2
-               ;;
-       arm*-rebel)
-               os=-linux
-               ;;
-       arm*-semi)
-               os=-aout
-               ;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
-       # This must come before the *-dec entry.
-       pdp10-*)
-               os=-tops20
-               ;;
-       pdp11-*)
-               os=-none
-               ;;
-       *-dec | vax-*)
-               os=-ultrix4.2
-               ;;
-       m68*-apollo)
-               os=-domain
-               ;;
-       i386-sun)
-               os=-sunos4.0.2
-               ;;
-       m68000-sun)
-               os=-sunos3
-               # This also exists in the configure program, but was not the
-               # default.
-               # os=-sunos4
-               ;;
-       m68*-cisco)
-               os=-aout
-               ;;
-       mips*-cisco)
-               os=-elf
-               ;;
-       mips*-*)
-               os=-elf
-               ;;
-       or32-*)
-               os=-coff
-               ;;
-       *-tti)  # must be before sparc entry or we get the wrong os.
-               os=-sysv3
-               ;;
-       sparc-* | *-sun)
-               os=-sunos4.1.1
-               ;;
-       *-be)
-               os=-beos
-               ;;
-       *-haiku)
-               os=-haiku
-               ;;
-       *-ibm)
-               os=-aix
-               ;;
-       *-knuth)
-               os=-mmixware
-               ;;
-       *-wec)
-               os=-proelf
-               ;;
-       *-winbond)
-               os=-proelf
-               ;;
-       *-oki)
-               os=-proelf
-               ;;
-       *-hp)
-               os=-hpux
-               ;;
-       *-hitachi)
-               os=-hiux
-               ;;
-       i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-               os=-sysv
-               ;;
-       *-cbm)
-               os=-amigaos
-               ;;
-       *-dg)
-               os=-dgux
-               ;;
-       *-dolphin)
-               os=-sysv3
-               ;;
-       m68k-ccur)
-               os=-rtu
-               ;;
-       m88k-omron*)
-               os=-luna
-               ;;
-       *-next )
-               os=-nextstep
-               ;;
-       *-sequent)
-               os=-ptx
-               ;;
-       *-crds)
-               os=-unos
-               ;;
-       *-ns)
-               os=-genix
-               ;;
-       i370-*)
-               os=-mvs
-               ;;
-       *-next)
-               os=-nextstep3
-               ;;
-       *-gould)
-               os=-sysv
-               ;;
-       *-highlevel)
-               os=-bsd
-               ;;
-       *-encore)
-               os=-bsd
-               ;;
-       *-sgi)
-               os=-irix
-               ;;
-       *-siemens)
-               os=-sysv4
-               ;;
-       *-masscomp)
-               os=-rtu
-               ;;
-       f30[01]-fujitsu | f700-fujitsu)
-               os=-uxpv
-               ;;
-       *-rom68k)
-               os=-coff
-               ;;
-       *-*bug)
-               os=-coff
-               ;;
-       *-apple)
-               os=-macos
-               ;;
-       *-atari*)
-               os=-mint
-               ;;
-       *)
-               os=-none
-               ;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-       *-unknown)
-               case $os in
-                       -riscix*)
-                               vendor=acorn
-                               ;;
-                       -sunos*)
-                               vendor=sun
-                               ;;
-                       -aix*)
-                               vendor=ibm
-                               ;;
-                       -beos*)
-                               vendor=be
-                               ;;
-                       -hpux*)
-                               vendor=hp
-                               ;;
-                       -mpeix*)
-                               vendor=hp
-                               ;;
-                       -hiux*)
-                               vendor=hitachi
-                               ;;
-                       -unos*)
-                               vendor=crds
-                               ;;
-                       -dgux*)
-                               vendor=dg
-                               ;;
-                       -luna*)
-                               vendor=omron
-                               ;;
-                       -genix*)
-                               vendor=ns
-                               ;;
-                       -mvs* | -opened*)
-                               vendor=ibm
-                               ;;
-                       -os400*)
-                               vendor=ibm
-                               ;;
-                       -ptx*)
-                               vendor=sequent
-                               ;;
-                       -tpf*)
-                               vendor=ibm
-                               ;;
-                       -vxsim* | -vxworks* | -windiss*)
-                               vendor=wrs
-                               ;;
-                       -aux*)
-                               vendor=apple
-                               ;;
-                       -hms*)
-                               vendor=hitachi
-                               ;;
-                       -mpw* | -macos*)
-                               vendor=apple
-                               ;;
-                       -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-                               vendor=atari
-                               ;;
-                       -vos*)
-                               vendor=stratus
-                               ;;
-               esac
-               basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-               ;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/experimental/modest/configure.ac b/experimental/modest/configure.ac
deleted file mode 100644 (file)
index df1253d..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-dnl configure.ac for modest 
-dnl Time-stamp: <2006-04-23 20:45:53 (djcb)>
-dnl written by Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>
-AC_INIT([modest],[0.0.5],[http://maemo.org])
-AC_CONFIG_SRCDIR(src/modest-main.c)
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
-
-AC_CONFIG_HEADERS([config.h])
-
-if test x$prefix=xNONE; then
-   prefix=/usr/local
-fi
-AC_SUBST(prefix)
-
-AC_PROG_CC
-AM_PROG_CC_C_O
-AM_PROG_CC_STDC
-AC_HEADER_STDC
-AC_PROG_LIBTOOL
-
-GTK_DOC_CHECK([1.0])
-
-# GLib/Gobject => mandatory
-PKG_CHECK_MODULES(MODEST_GSTUFF,glib-2.0 >= 2.6 gobject-2.0) 
-AC_SUBST(MODEST_GSTUFF_CFLAGS)
-AC_SUBST(MODEST_GSTUFF_LIBS)
-
-# tinymail => mandatory
-PKG_CHECK_MODULES(MODEST_TINYMAIL, libtinymail-1.0 libtinymail-camel-1.0 libtinymailui-1.0 libtinymailui-gtk-1.0)
-AC_SUBST(MODEST_TINYMAIL_CFLAGS)
-AC_SUBST(MODEST_TINYMAIL_LIBS)
-
-# Gtk+
-PKG_CHECK_MODULES(MODEST_GTK,gtk+-2.0 >= 2.6,gtk_support=yes,echo "no";gtk_support=no)
-AC_SUBST(MODEST_GTK_CFLAGS)
-AC_SUBST(MODEST_GTK_LIBS)
-
-# GConf
-PKG_CHECK_MODULES(MODEST_GCONF,gconf-2.0,gconf_support=yes,echo "no";gconf_support=no)
-AC_SUBST(MODEST_GCONF_CFLAGS)
-AC_SUBST(MODEST_GCONF_LIBS)
-
-# Glade
-PKG_CHECK_MODULES(MODEST_GLADE,libglade-2.0,glade_support=yes,echo "no";glade_support=no)
-AC_SUBST(MODEST_GLADE_CFLAGS)
-AC_SUBST(MODEST_GLADE_LIBS)
-
-dnl build the Hildon UI?
-PKG_CHECK_MODULES(MODEST_HILDON,hildon libglade-2.0 libtinymailui-gtk-1.0,hildon_support=yes,echo "no";hildon_support=no)
-AC_SUBST(MODEST_HILDON_CFLAGS)                                
-AC_SUBST(MODEST_HILDON_LIBS)
-
-
-dnl now, determine what to build
-AC_MSG_NOTICE([Determining what UI to build])
-modest_ui="none"
-if test "x$hildon_support" = "xyes"; then
-      AC_SUBST(MODEST_UI_DIR,"hildon")
-      AC_DEFINE([MODEST_ENABLE_HILDON_UI],1,[Enable Hildon UI])
-      modest_ui="hildon"
-dnl elif test "x$glade_support" = "xyes"; then
-dnl      AC_SUBST(MODEST_UI_DIR,"gtk-glade")            
-dnl      AC_DEFINE([MODEST_ENABLE_GTK_GLADE_UI],1,[Enable Gtk-Glade UI])
-dnl      modest_ui="gtk-glade"                                         
-elif  test "x$gtk_support" = "xyes"; then
-      AC_SUBST(MODEST_UI_DIR,"gtk")             
-      AC_DEFINE([MODEST_ENABLE_GTK_UI],1,[Enable Plain Gtk+ UI])
-      modest_ui="gtk-plain"                                            
-else
-      AC_MSG_ERROR([No supported UI found. Please check your installation])
-fi
-
-
-AC_MSG_NOTICE([Determining what configuration system to support])
-modest_conf="none"
-if test "x$gconf_support"="xyes"; then
-      AC_DEFINE([MODEST_ENABLE_GCONF],1,[Enable GConf])
-      modest_conf="gconf"
-else
-      AC_MSG_ERROR([No supported configuration system found. Please check your installation])
-fi
-AM_CONDITIONAL(MODEST_ENABLE_GCONF,test "x$modest_conf" = "xgconf")
-
-AC_OUTPUT([
-Makefile
-src/Makefile
-src/gtk/Makefile
-src/gtk-glade/Makefile
-src/hildon/Makefile
-docs/Makefile
-docs/reference/Makefile
-])
-
-echo
-echo "modest configure results"
-echo "-----------------------------------"
-echo "User-interface       : $modest_ui"
-echo "Configuration-system : $modest_conf"
-echo ""
diff --git a/experimental/modest/docs/Makefile.am b/experimental/modest/docs/Makefile.am
deleted file mode 100644 (file)
index 309d2e1..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Makefile.am
-# Time-stamp: <2006-04-17 13:23:36 (djcb)>
-SUBDIRS=reference
diff --git a/experimental/modest/docs/reference/Makefile.am b/experimental/modest/docs/reference/Makefile.am
deleted file mode 100644 (file)
index 31703d1..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-# This is a blank Makefile.am for using gtk-doc.
-# Copy this to your project's API docs directory and modify the variables to
-# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples
-# of using the various options.
-
-# The name of the module, e.g. 'glib'.
-DOC_MODULE=modest
-
-# The top-level SGML file. You can change this if you want to.
-DOC_MAIN_SGML_FILE=modest-docs.sgml
-
-# The directory containing the source code. Relative to $(srcdir).
-# gtk-doc will search all .c & .h files beneath here for inline comments
-# documenting the functions and macros.
-# e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=$(top_srcdir)/src
-
-# Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=
-
-# Extra options to supply to gtkdoc-scan.
-# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" 
-SCAN_OPTIONS=
-
-# Extra options to supply to gtkdoc-mkdb.
-# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
-MKDB_OPTIONS=--sgml-mode --output-format=xml
-
-# Extra options to supply to gtkdoc-mktmpl
-# e.g. MKTMPL_OPTIONS=--only-section-tmpl
-MKTMPL_OPTIONS=
-
-# Extra options to supply to gtkdoc-fixref. Not normally needed.
-# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
-FIXXREF_OPTIONS=
-
-# Used for dependencies. The docs will be rebuilt if any of these change.
-# e.g. HFILE_GLOB=$(top_srcdir)/*.h
-# e.g. CFILE_GLOB=$(top_srcdir)/*.c
-HFILE_GLOB=$(top_srcdir)/src/*.h 
-CFILE_GLOB=$(top_srcdir)/src/*.c 
-
-# Header files to ignore when scanning.
-# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES=
-
-# Images to copy into HTML directory.
-# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
-HTML_IMAGES=
-
-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
-# e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files=#xml/tree_index.sgml
-
-# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
-# These files must be listed here *and* in content_files
-# e.g. expand_content_files=running.sgml
-expand_content_files=
-
-# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
-# Only needed if you are using gtkdoc-scangobj to dynamically query widget
-# signals and properties.
-# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
-# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-INCLUDES=-I$(top_srcdir)/src $(MODEST_GSTUFF_CFLAGS)
-GTKDOC_LIBS=$(MODEST_GSTUFF_LIBS)
-
-# This includes the standard gtk-doc make rules, copied by gtkdocize.
-include $(top_srcdir)/gtk-doc.make
-
-# Other files to distribute
-# e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST += 
diff --git a/experimental/modest/docs/reference/html/home.png b/experimental/modest/docs/reference/html/home.png
deleted file mode 100644 (file)
index 1700361..0000000
Binary files a/experimental/modest/docs/reference/html/home.png and /dev/null differ
diff --git a/experimental/modest/docs/reference/html/index.html b/experimental/modest/docs/reference/html/index.html
deleted file mode 100644 (file)
index f2922ff..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>modest reference manual</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.68.1">
-<link rel="start" href="index.html" title="modest reference manual">
-<link rel="next" href="pr01.html" title="Introduction">
-<meta name="generator" content="GTK-Doc V1.6 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-<link rel="preface" href="pr01.html" title="Introduction">
-<link rel="reference" href="rn01.html" title="Object Index">
-<link rel="reference" href="rn02.html" title="API Reference">
-<link rel="chapter" href="modest-core.html" title="modest general">
-<link rel="index" href="ix01.html" title="Index">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" lang="en">
-<div class="titlepage">
-<div><div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">modest reference manual</p></th></tr></table></div></div>
-<hr>
-</div>
-<div class="toc">
-<p><b>Table of Contents</b></p>
-<dl>
-<dt><span class="preface"><a href="pr01.html">Introduction</a></span></dt>
-<dt><span class="reference"><a href="rn01.html">I. Object Index</a></span></dt>
-<dt><span class="reference"><a href="rn02.html">II. API Reference</a></span></dt>
-<dd><dl>
-<dt><span class="chapter"><a href="modest-core.html">modest general</a></span></dt>
-<dd><dl><dt>
-<span class="refentrytitle"><a href="modest-ModestConf.html">ModestConf</a></span><span class="refpurpose"> - </span>
-</dt></dl></dd>
-</dl></dd>
-<dt><span class="index"><a href="ix01.html">Index</a></span></dt>
-</dl>
-</div>
-</div></body>
-</html>
diff --git a/experimental/modest/docs/reference/html/index.sgml b/experimental/modest/docs/reference/html/index.sgml
deleted file mode 100644 (file)
index fcd2fba..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<ANCHOR id="modest-ModestConf" href="modest/modest-ModestConf.html">
-<ANCHOR id="ModestConf" href="modest/modest-ModestConf.html#ModestConf">
-<ANCHOR id="modest-conf-new" href="modest/modest-ModestConf.html#modest-conf-new">
-<ANCHOR id="modest-conf-get-string" href="modest/modest-ModestConf.html#modest-conf-get-string">
-<ANCHOR id="modest-conf-get-int" href="modest/modest-ModestConf.html#modest-conf-get-int">
-<ANCHOR id="modest-conf-get-bool" href="modest/modest-ModestConf.html#modest-conf-get-bool">
-<ANCHOR id="modest-conf-set-string" href="modest/modest-ModestConf.html#modest-conf-set-string">
-<ANCHOR id="modest-conf-set-int" href="modest/modest-ModestConf.html#modest-conf-set-int">
-<ANCHOR id="modest-conf-set-bool" href="modest/modest-ModestConf.html#modest-conf-set-bool">
-<ANCHOR id="modest-conf-list-subkeys" href="modest/modest-ModestConf.html#modest-conf-list-subkeys">
-<ANCHOR id="modest-conf-remove-key" href="modest/modest-ModestConf.html#modest-conf-remove-key">
-<ANCHOR id="modest-conf-key-exists" href="modest/modest-ModestConf.html#modest-conf-key-exists">
diff --git a/experimental/modest/docs/reference/html/ix01.html b/experimental/modest/docs/reference/html/ix01.html
deleted file mode 100644 (file)
index 5698ef8..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Index</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.68.1">
-<link rel="start" href="index.html" title="modest reference manual">
-<link rel="up" href="index.html" title="modest reference manual">
-<link rel="prev" href="modest-ModestConf.html" title="ModestConf">
-<meta name="generator" content="GTK-Doc V1.6 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-<link rel="preface" href="pr01.html" title="Introduction">
-<link rel="reference" href="rn01.html" title="Object Index">
-<link rel="reference" href="rn02.html" title="API Reference">
-<link rel="chapter" href="modest-core.html" title="modest general">
-<link rel="index" href="ix01.html" title="Index">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="modest-ModestConf.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td>&#160;</td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">modest reference manual</th>
-<td>&#160;</td>
-</tr></table>
-<div class="index">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="id2520028"></a>Index</h2></div></div></div>
-<div class="index"><div class="indexdiv">
-<h3>M</h3>
-<dl>
-<dt>ModestConf, <a href="modest-ModestConf.html#id2517677">ModestConf</a>
-</dt>
-<dt>modest_conf_get_bool, <a href="modest-ModestConf.html#id2518008">modest_conf_get_bool ()</a>
-</dt>
-<dt>modest_conf_get_int, <a href="modest-ModestConf.html#id2517884">modest_conf_get_int ()</a>
-</dt>
-<dt>modest_conf_get_string, <a href="modest-ModestConf.html#id2517755">modest_conf_get_string ()</a>
-</dt>
-<dt>modest_conf_key_exists, <a href="modest-ModestConf.html#id2518823">modest_conf_key_exists ()</a>
-</dt>
-<dt>modest_conf_list_subkeys, <a href="modest-ModestConf.html#id2518568">modest_conf_list_subkeys ()</a>
-</dt>
-<dt>modest_conf_new, <a href="modest-ModestConf.html#id2517704">modest_conf_new ()</a>
-</dt>
-<dt>modest_conf_remove_key, <a href="modest-ModestConf.html#id2518693">modest_conf_remove_key ()</a>
-</dt>
-<dt>modest_conf_set_bool, <a href="modest-ModestConf.html#id2518423">modest_conf_set_bool ()</a>
-</dt>
-<dt>modest_conf_set_int, <a href="modest-ModestConf.html#id2518279">modest_conf_set_int ()</a>
-</dt>
-<dt>modest_conf_set_string, <a href="modest-ModestConf.html#id2518133">modest_conf_set_string ()</a>
-</dt>
-</dl>
-</div></div>
-</div>
-</body>
-</html>
diff --git a/experimental/modest/docs/reference/html/left.png b/experimental/modest/docs/reference/html/left.png
deleted file mode 100644 (file)
index 2d05b3d..0000000
Binary files a/experimental/modest/docs/reference/html/left.png and /dev/null differ
diff --git a/experimental/modest/docs/reference/html/modest-ModestConf.html b/experimental/modest/docs/reference/html/modest-ModestConf.html
deleted file mode 100644 (file)
index 8995b94..0000000
+++ /dev/null
@@ -1,536 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>ModestConf</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.68.1">
-<link rel="start" href="index.html" title="modest reference manual">
-<link rel="up" href="modest-core.html" title="modest general">
-<link rel="prev" href="modest-core.html" title="modest general">
-<link rel="next" href="ix01.html" title="Index">
-<meta name="generator" content="GTK-Doc V1.6 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-<link rel="preface" href="pr01.html" title="Introduction">
-<link rel="reference" href="rn01.html" title="Object Index">
-<link rel="reference" href="rn02.html" title="API Reference">
-<link rel="chapter" href="modest-core.html" title="modest general">
-<link rel="index" href="ix01.html" title="Index">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="modest-core.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="modest-core.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">modest reference manual</th>
-<td><a accesskey="n" href="ix01.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts"><nobr><a href="#top_of_page" class="shortcut">Top</a>
-                  &#160;|&#160;
-                  <a href="#desc" class="shortcut">Description</a></nobr></td></tr>
-</table>
-<div class="refentry" lang="en">
-<a name="modest-ModestConf"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="top_of_page"></a>ModestConf</span></h2>
-<p>ModestConf &#8212; </p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsynopsisdiv">
-<a name="synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-
-
-
-            <a href="modest-ModestConf.html#ModestConf">ModestConf</a>;
-GObject*    <a href="modest-ModestConf.html#modest-conf-new">modest_conf_new</a>                 (void);
-gchar*      <a href="modest-ModestConf.html#modest-conf-get-string">modest_conf_get_string</a>          (<a href="modest-ModestConf.html#ModestConf">ModestConf</a> *self,
-                                             const gchar *key,
-                                             GError **err);
-int         <a href="modest-ModestConf.html#modest-conf-get-int">modest_conf_get_int</a>             (<a href="modest-ModestConf.html#ModestConf">ModestConf</a> *self,
-                                             const gchar *key,
-                                             GError **err);
-gboolean    <a href="modest-ModestConf.html#modest-conf-get-bool">modest_conf_get_bool</a>            (<a href="modest-ModestConf.html#ModestConf">ModestConf</a> *self,
-                                             const gchar *key,
-                                             GError **err);
-gboolean    <a href="modest-ModestConf.html#modest-conf-set-string">modest_conf_set_string</a>          (<a href="modest-ModestConf.html#ModestConf">ModestConf</a> *self,
-                                             const gchar *key,
-                                             const gchar *val,
-                                             GError **err);
-gboolean    <a href="modest-ModestConf.html#modest-conf-set-int">modest_conf_set_int</a>             (<a href="modest-ModestConf.html#ModestConf">ModestConf</a> *self,
-                                             const gchar *key,
-                                             int val,
-                                             GError **err);
-gboolean    <a href="modest-ModestConf.html#modest-conf-set-bool">modest_conf_set_bool</a>            (<a href="modest-ModestConf.html#ModestConf">ModestConf</a> *self,
-                                             const gchar *key,
-                                             gboolean val,
-                                             GError **err);
-GSList*     <a href="modest-ModestConf.html#modest-conf-list-subkeys">modest_conf_list_subkeys</a>        (<a href="modest-ModestConf.html#ModestConf">ModestConf</a> *self,
-                                             const gchar *key,
-                                             GError **err);
-gboolean    <a href="modest-ModestConf.html#modest-conf-remove-key">modest_conf_remove_key</a>          (<a href="modest-ModestConf.html#ModestConf">ModestConf</a> *self,
-                                             const gchar *key,
-                                             GError **err);
-gboolean    <a href="modest-ModestConf.html#modest-conf-key-exists">modest_conf_key_exists</a>          (<a href="modest-ModestConf.html#ModestConf">ModestConf</a> *self,
-                                             const gchar *key,
-                                             GError **err);
-
-</pre>
-</div>
-<div class="refsect1" lang="en">
-<a name="desc"></a><h2>Description</h2>
-<p>
-
-</p>
-</div>
-<div class="refsect1" lang="en">
-<a name="details"></a><h2>Details</h2>
-<div class="refsect2" lang="en">
-<a name="id2517677"></a><h3>
-<a name="ModestConf"></a>ModestConf</h3>
-<a class="indexterm" name="id2517689"></a><pre class="programlisting">typedef struct {
-        GObject parent;
-} ModestConf;
-</pre>
-<p>
-
-</p>
-</div>
-<hr>
-<div class="refsect2" lang="en">
-<a name="id2517704"></a><h3>
-<a name="modest-conf-new"></a>modest_conf_new ()</h3>
-<a class="indexterm" name="id2517717"></a><pre class="programlisting">GObject*    modest_conf_new                 (void);</pre>
-<p>
-create a new modest ModestConf object.</p>
-<p>
-
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td>
-<span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></td>
-<td> a new ModestConf instance, or NULL in case
-of any error
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" lang="en">
-<a name="id2517755"></a><h3>
-<a name="modest-conf-get-string"></a>modest_conf_get_string ()</h3>
-<a class="indexterm" name="id2517771"></a><pre class="programlisting">gchar*      modest_conf_get_string          (<a href="modest-ModestConf.html#ModestConf">ModestConf</a> *self,
-                                             const gchar *key,
-                                             GError **err);</pre>
-<p>
-get a string from the configuration system</p>
-<p>
-
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>self</code></em>&#160;:</span></td>
-<td> self a ModestConf instance
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>key</code></em>&#160;:</span></td>
-<td> the key of the value to retrieve
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>err</code></em>&#160;:</span></td>
-<td> a GError ptr, or NULL to ignore.
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></td>
-<td> a newly allocated string with the value for the key,
-or NULL in case of error. <em class="parameter"><code>err</code></em> gives details in case of error
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" lang="en">
-<a name="id2517884"></a><h3>
-<a name="modest-conf-get-int"></a>modest_conf_get_int ()</h3>
-<a class="indexterm" name="id2517897"></a><pre class="programlisting">int         modest_conf_get_int             (<a href="modest-ModestConf.html#ModestConf">ModestConf</a> *self,
-                                             const gchar *key,
-                                             GError **err);</pre>
-<p>
-get an integer from the configuration system</p>
-<p>
-
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>self</code></em>&#160;:</span></td>
-<td> self a ModestConf instance
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>key</code></em>&#160;:</span></td>
-<td> the key of the value to retrieve
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>err</code></em>&#160;:</span></td>
-<td> a GError ptr, or NULL to ignore.
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></td>
-<td> an integer with the value for the key, or -1 in case of error
-(of course, -1 can also be returned in non-error cases).
-<em class="parameter"><code>err</code></em> gives details in case of error
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" lang="en">
-<a name="id2518008"></a><h3>
-<a name="modest-conf-get-bool"></a>modest_conf_get_bool ()</h3>
-<a class="indexterm" name="id2518021"></a><pre class="programlisting">gboolean    modest_conf_get_bool            (<a href="modest-ModestConf.html#ModestConf">ModestConf</a> *self,
-                                             const gchar *key,
-                                             GError **err);</pre>
-<p>
-get a boolean value from the configuration system</p>
-<p>
-
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>self</code></em>&#160;:</span></td>
-<td> self a ModestConf instance
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>key</code></em>&#160;:</span></td>
-<td> the key of the value to retrieve
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>err</code></em>&#160;:</span></td>
-<td> a GError ptr, or NULL to ignore.
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></td>
-<td> a boolean value with the value for the key, or -1 in case of error
-(of course, -1 can also be returned in non-error cases).
-<em class="parameter"><code>err</code></em> gives details in case of error
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" lang="en">
-<a name="id2518133"></a><h3>
-<a name="modest-conf-set-string"></a>modest_conf_set_string ()</h3>
-<a class="indexterm" name="id2518146"></a><pre class="programlisting">gboolean    modest_conf_set_string          (<a href="modest-ModestConf.html#ModestConf">ModestConf</a> *self,
-                                             const gchar *key,
-                                             const gchar *val,
-                                             GError **err);</pre>
-<p>
-store a string value in the configuration system</p>
-<p>
-
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>self</code></em>&#160;:</span></td>
-<td> a ModestConf instance
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>key</code></em>&#160;:</span></td>
-<td> the key of the value to set
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>val</code></em>&#160;:</span></td>
-<td> the value to set
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>err</code></em>&#160;:</span></td>
-<td> a GError ptr, or NULL if not interested.
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></td>
-<td> TRUE if succeeded or FALSE in case of error.
-<em class="parameter"><code>err</code></em> gives details in case of error
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" lang="en">
-<a name="id2518279"></a><h3>
-<a name="modest-conf-set-int"></a>modest_conf_set_int ()</h3>
-<a class="indexterm" name="id2518292"></a><pre class="programlisting">gboolean    modest_conf_set_int             (<a href="modest-ModestConf.html#ModestConf">ModestConf</a> *self,
-                                             const gchar *key,
-                                             int val,
-                                             GError **err);</pre>
-<p>
-store an integer value in the configuration system</p>
-<p>
-
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>self</code></em>&#160;:</span></td>
-<td> a ModestConf instance
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>key</code></em>&#160;:</span></td>
-<td> the key of the value to set
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>val</code></em>&#160;:</span></td>
-<td> the value to set
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>err</code></em>&#160;:</span></td>
-<td> a GError ptr, or NULL if not interested.
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></td>
-<td> TRUE if succeeded or FALSE in case of error.
-<em class="parameter"><code>err</code></em> gives details in case of error
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" lang="en">
-<a name="id2518423"></a><h3>
-<a name="modest-conf-set-bool"></a>modest_conf_set_bool ()</h3>
-<a class="indexterm" name="id2518436"></a><pre class="programlisting">gboolean    modest_conf_set_bool            (<a href="modest-ModestConf.html#ModestConf">ModestConf</a> *self,
-                                             const gchar *key,
-                                             gboolean val,
-                                             GError **err);</pre>
-<p>
-store a boolean value in the configuration system</p>
-<p>
-
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>self</code></em>&#160;:</span></td>
-<td> a ModestConf instance
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>key</code></em>&#160;:</span></td>
-<td> the key of the value to set
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>val</code></em>&#160;:</span></td>
-<td> the value to set
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>err</code></em>&#160;:</span></td>
-<td> a GError ptr, or NULL if not interested.
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></td>
-<td> TRUE if succeeded or FALSE in case of error.
-<em class="parameter"><code>err</code></em> gives details in case of error
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" lang="en">
-<a name="id2518568"></a><h3>
-<a name="modest-conf-list-subkeys"></a>modest_conf_list_subkeys ()</h3>
-<a class="indexterm" name="id2518581"></a><pre class="programlisting">GSList*     modest_conf_list_subkeys        (<a href="modest-ModestConf.html#ModestConf">ModestConf</a> *self,
-                                             const gchar *key,
-                                             GError **err);</pre>
-<p>
-list all the subkeys for a given key</p>
-<p>
-
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>self</code></em>&#160;:</span></td>
-<td> a ModestConf instance
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>key</code></em>&#160;:</span></td>
-<td> the key whose subkeys will be listed
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>err</code></em>&#160;:</span></td>
-<td> a GError ptr, or NULL if not interested.
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></td>
-<td> a newly allocated list or NULL in case of error
-the returned GSList must be freed by the caller
-<em class="parameter"><code>err</code></em> gives details in case of error
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" lang="en">
-<a name="id2518693"></a><h3>
-<a name="modest-conf-remove-key"></a>modest_conf_remove_key ()</h3>
-<a class="indexterm" name="id2518706"></a><pre class="programlisting">gboolean    modest_conf_remove_key          (<a href="modest-ModestConf.html#ModestConf">ModestConf</a> *self,
-                                             const gchar *key,
-                                             GError **err);</pre>
-<p>
-attempts to remove <em class="parameter"><code>key</code></em> and all its subkeys</p>
-<p>
-
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>self</code></em>&#160;:</span></td>
-<td> a ModestConf instance
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>key</code></em>&#160;:</span></td>
-<td> the key to remove
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>err</code></em>&#160;:</span></td>
-<td> a GError ptr, or NULL if not interested.
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></td>
-<td> TRUE if succeeded or FALSE in case of error.
-<em class="parameter"><code>err</code></em> gives details in case of error
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" lang="en">
-<a name="id2518823"></a><h3>
-<a name="modest-conf-key-exists"></a>modest_conf_key_exists ()</h3>
-<a class="indexterm" name="id2518835"></a><pre class="programlisting">gboolean    modest_conf_key_exists          (<a href="modest-ModestConf.html#ModestConf">ModestConf</a> *self,
-                                             const gchar *key,
-                                             GError **err);</pre>
-<p>
-checks if the given key exists in the configuration system</p>
-<p>
-
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>self</code></em>&#160;:</span></td>
-<td> a ModestConf instance
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>key</code></em>&#160;:</span></td>
-<td> the key to remove
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>err</code></em>&#160;:</span></td>
-<td> a GError ptr, or NULL if not interested.
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></td>
-<td> TRUE if exists, FALSE otherwise.
-<em class="parameter"><code>err</code></em> gives details in case of error
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-</div>
-</body>
-</html>
diff --git a/experimental/modest/docs/reference/html/modest-core.html b/experimental/modest/docs/reference/html/modest-core.html
deleted file mode 100644 (file)
index b89b469..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>modest general</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.68.1">
-<link rel="start" href="index.html" title="modest reference manual">
-<link rel="up" href="rn02.html" title="API Reference">
-<link rel="prev" href="rn02.html" title="API Reference">
-<link rel="next" href="modest-ModestConf.html" title="ModestConf">
-<meta name="generator" content="GTK-Doc V1.6 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-<link rel="preface" href="pr01.html" title="Introduction">
-<link rel="reference" href="rn01.html" title="Object Index">
-<link rel="reference" href="rn02.html" title="API Reference">
-<link rel="chapter" href="modest-core.html" title="modest general">
-<link rel="index" href="ix01.html" title="Index">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="rn02.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="rn02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">modest reference manual</th>
-<td><a accesskey="n" href="modest-ModestConf.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr></table>
-<div class="chapter" lang="en">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="modest-core"></a>modest general</h2></div></div></div>
-<div class="toc"><dl><dt>
-<span class="refentrytitle"><a href="modest-ModestConf.html">ModestConf</a></span><span class="refpurpose"> - </span>
-</dt></dl></div>
-</div>
-</body>
-</html>
diff --git a/experimental/modest/docs/reference/html/modest.devhelp b/experimental/modest/docs/reference/html/modest.devhelp
deleted file mode 100644 (file)
index 45f010f..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
-<book xmlns="http://www.devhelp.net/book" title="modest reference manual" link="index.html" author="" name="modest">
-  <chapters>
-    <sub name="Introduction" link="pr01.html"/>
-    <sub name="Object Index" link="rn01.html"/>
-    <sub name="API Reference" link="rn02.html">
-      <sub name="modest general" link="modest-core.html">
-        <sub name="ModestConf" link="modest-ModestConf.html"/>
-      </sub>
-    </sub>
-    <sub name="Index" link="ix01.html"/>
-  </chapters>
-  <functions>
-    <function name="ModestConf" link="modest-ModestConf.html#ModestConf"/>
-    <function name="modest_conf_new ()" link="modest-ModestConf.html#modest-conf-new"/>
-    <function name="modest_conf_get_string ()" link="modest-ModestConf.html#modest-conf-get-string"/>
-    <function name="modest_conf_get_int ()" link="modest-ModestConf.html#modest-conf-get-int"/>
-    <function name="modest_conf_get_bool ()" link="modest-ModestConf.html#modest-conf-get-bool"/>
-    <function name="modest_conf_set_string ()" link="modest-ModestConf.html#modest-conf-set-string"/>
-    <function name="modest_conf_set_int ()" link="modest-ModestConf.html#modest-conf-set-int"/>
-    <function name="modest_conf_set_bool ()" link="modest-ModestConf.html#modest-conf-set-bool"/>
-    <function name="modest_conf_list_subkeys ()" link="modest-ModestConf.html#modest-conf-list-subkeys"/>
-    <function name="modest_conf_remove_key ()" link="modest-ModestConf.html#modest-conf-remove-key"/>
-    <function name="modest_conf_key_exists ()" link="modest-ModestConf.html#modest-conf-key-exists"/>
-  </functions>
-</book>
diff --git a/experimental/modest/docs/reference/html/modest.devhelp2 b/experimental/modest/docs/reference/html/modest.devhelp2
deleted file mode 100644 (file)
index 9b8a8d5..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
-<book xmlns="http://www.devhelp.net/book" title="modest reference manual" link="index.html" author="" name="modest" version="2">
-  <chapters>
-    <sub name="Introduction" link="pr01.html"/>
-    <sub name="Object Index" link="rn01.html"/>
-    <sub name="API Reference" link="rn02.html">
-      <sub name="modest general" link="modest-core.html">
-        <sub name="ModestConf" link="modest-ModestConf.html"/>
-      </sub>
-    </sub>
-    <sub name="Index" link="ix01.html"/>
-  </chapters>
-  <functions>
-    <keyword type="struct" name="ModestConf" link="modest-ModestConf.html#ModestConf"/>
-    <keyword type="function" name="modest_conf_new ()" link="modest-ModestConf.html#modest-conf-new"/>
-    <keyword type="function" name="modest_conf_get_string ()" link="modest-ModestConf.html#modest-conf-get-string"/>
-    <keyword type="function" name="modest_conf_get_int ()" link="modest-ModestConf.html#modest-conf-get-int"/>
-    <keyword type="function" name="modest_conf_get_bool ()" link="modest-ModestConf.html#modest-conf-get-bool"/>
-    <keyword type="function" name="modest_conf_set_string ()" link="modest-ModestConf.html#modest-conf-set-string"/>
-    <keyword type="function" name="modest_conf_set_int ()" link="modest-ModestConf.html#modest-conf-set-int"/>
-    <keyword type="function" name="modest_conf_set_bool ()" link="modest-ModestConf.html#modest-conf-set-bool"/>
-    <keyword type="function" name="modest_conf_list_subkeys ()" link="modest-ModestConf.html#modest-conf-list-subkeys"/>
-    <keyword type="function" name="modest_conf_remove_key ()" link="modest-ModestConf.html#modest-conf-remove-key"/>
-    <keyword type="function" name="modest_conf_key_exists ()" link="modest-ModestConf.html#modest-conf-key-exists"/>
-  </functions>
-</book>
diff --git a/experimental/modest/docs/reference/html/pr01.html b/experimental/modest/docs/reference/html/pr01.html
deleted file mode 100644 (file)
index a426c76..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Introduction</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.68.1">
-<link rel="start" href="index.html" title="modest reference manual">
-<link rel="up" href="index.html" title="modest reference manual">
-<link rel="prev" href="index.html" title="modest reference manual">
-<link rel="next" href="rn01.html" title="Object Index">
-<meta name="generator" content="GTK-Doc V1.6 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-<link rel="preface" href="pr01.html" title="Introduction">
-<link rel="reference" href="rn01.html" title="Object Index">
-<link rel="reference" href="rn02.html" title="API Reference">
-<link rel="chapter" href="modest-core.html" title="modest general">
-<link rel="index" href="ix01.html" title="Index">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="index.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td>&#160;</td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">modest reference manual</th>
-<td><a accesskey="n" href="rn01.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr></table>
-<div class="preface" lang="en">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="id2508394"></a>Introduction</h2></div></div></div>
-<p>modest is a lightweight e-mail program, built on top of
-    tinymail and libcamel</p>
-</div>
-</body>
-</html>
diff --git a/experimental/modest/docs/reference/html/right.png b/experimental/modest/docs/reference/html/right.png
deleted file mode 100644 (file)
index 92832e3..0000000
Binary files a/experimental/modest/docs/reference/html/right.png and /dev/null differ
diff --git a/experimental/modest/docs/reference/html/rn01.html b/experimental/modest/docs/reference/html/rn01.html
deleted file mode 100644 (file)
index 6aae1e3..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Object Index</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.68.1">
-<link rel="start" href="index.html" title="modest reference manual">
-<link rel="up" href="index.html" title="modest reference manual">
-<link rel="prev" href="pr01.html" title="Introduction">
-<link rel="next" href="rn02.html" title="API Reference">
-<meta name="generator" content="GTK-Doc V1.6 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-<link rel="preface" href="pr01.html" title="Introduction">
-<link rel="reference" href="rn01.html" title="Object Index">
-<link rel="reference" href="rn02.html" title="API Reference">
-<link rel="chapter" href="modest-core.html" title="modest general">
-<link rel="index" href="ix01.html" title="Index">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="pr01.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td>&#160;</td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">modest reference manual</th>
-<td><a accesskey="n" href="rn02.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr></table>
-<div class="reference" lang="en">
-<a name="id2508405"></a><div class="titlepage">
-<div><div><h1 class="title">
-<a name="id2508405"></a>Object Index</h1></div></div>
-<hr>
-</div>
-<div class="informaltable"><table width="100%" border="0">
-<colgroup>
-<col>
-<col>
-<col>
-</colgroup>
-<tbody><tr>
-<td> </td>
-<td class="auto-generated">&#160;</td>
-<td class="auto-generated">&#160;</td>
-</tr></tbody>
-</table></div>
-<pre class="screen">
-</pre>
-</div>
-</body>
-</html>
diff --git a/experimental/modest/docs/reference/html/rn02.html b/experimental/modest/docs/reference/html/rn02.html
deleted file mode 100644 (file)
index 23dc01a..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>API Reference</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.68.1">
-<link rel="start" href="index.html" title="modest reference manual">
-<link rel="up" href="index.html" title="modest reference manual">
-<link rel="prev" href="rn01.html" title="Object Index">
-<link rel="next" href="modest-core.html" title="modest general">
-<meta name="generator" content="GTK-Doc V1.6 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-<link rel="preface" href="pr01.html" title="Introduction">
-<link rel="reference" href="rn01.html" title="Object Index">
-<link rel="reference" href="rn02.html" title="API Reference">
-<link rel="chapter" href="modest-core.html" title="modest general">
-<link rel="index" href="ix01.html" title="Index">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="rn01.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td>&#160;</td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">modest reference manual</th>
-<td><a accesskey="n" href="modest-core.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr></table>
-<div class="reference" lang="en">
-<a name="id2508484"></a><div class="titlepage">
-<div><div><h1 class="title">
-<a name="id2508484"></a>API Reference</h1></div></div>
-<hr>
-</div>
-</div>
-</body>
-</html>
diff --git a/experimental/modest/docs/reference/html/style.css b/experimental/modest/docs/reference/html/style.css
deleted file mode 100644 (file)
index 261896b..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-.synopsis, .classsynopsis 
-{
-  background: #eeeeee;
-  border: solid 1px #aaaaaa;
-  padding: 0.5em;
-}
-.programlisting 
-{
-  background: #eeeeff;
-  border: solid 1px #aaaaff;
-  padding: 0.5em;
-}
-.variablelist 
-{
-  padding: 4px;
-  margin-left: 3em;
-}
-.variablelist td:first-child
-{
-  vertical-align: top;
-}
-div a[name]
-{
-  position: relative;
-  top: -4.5em;
-}
-table.navigation#top
-{
-  background: #ffeeee;
-  border: solid 1px #ffaaaa;
-  margin-top: 0;
-  margin-bottom: 0;
-  position: fixed;
-  top: 0;
-  left: 0;
-  height: 2em;
-  z-index: 1;
-}
-.navigation a 
-{
-  color: #770000;
-}
-.navigation a:visited 
-{
-  color: #550000;
-}
-.navigation .title 
-{
-  font-size: 200%;
-}
-td.shortcuts
-{
-  color: #770000;
-  font-size: 80%;
-}
-
-div.refentry, div.chapter, div.part, div.book, div.index, div.glossary, div.sect1
-{
-  position: relative;
-  top: 3em;
-  z-index: 0;
-}
-div.refnamediv 
-{
-  margin-top: 2em;
-}
-div.gallery-float 
-{
-  float: left;
-  padding: 10px;
-}
-div.gallery-float img 
-{
-  border-style: none;
-}
-div.gallery-spacer 
-{
-  clear: both;
-}
-a
-{
-  text-decoration: none;
-}
-a:hover
-{
-  text-decoration: underline;
-  color: #FF0000;
-}
diff --git a/experimental/modest/docs/reference/html/up.png b/experimental/modest/docs/reference/html/up.png
deleted file mode 100644 (file)
index 85b3e2a..0000000
Binary files a/experimental/modest/docs/reference/html/up.png and /dev/null differ
diff --git a/experimental/modest/docs/reference/modest-docs.sgml b/experimental/modest/docs/reference/modest-docs.sgml
deleted file mode 100644 (file)
index 167deba..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-
-<!ENTITY modest-ModestConf SYSTEM  "xml/modest-conf.xml">
-
-<!ENTITY index-Object-Tree SYSTEM "xml/tree_index.sgml">
-<!ENTITY index-Object-Index SYSTEM "xml/object_index.sgml">
-]>
-
-<book id="index">
-  <bookinfo>
-    <title>modest reference manual</title>
-  </bookinfo>
-
-  <preface>
-    <title>Introduction</title>
-    <para>modest is a lightweight e-mail program, built on top of
-    tinymail and libcamel</para>
-  </preface>
-
-  <reference>
-    <title>Object Index</title>
-       &index-Object-Index;
-       &index-Object-Tree;
-  </reference>
-
-  <reference>
-    <title>API Reference</title>
-
-       <chapter id="modest-core">
-               <title>modest general</title>
-               &modest-ModestConf;
-       </chapter>
-
-  </reference>
-
-  <index>
-    <title>Index</title>
-  </index>
-  
-</book>
-
diff --git a/experimental/modest/docs/reference/modest-overrides.txt b/experimental/modest/docs/reference/modest-overrides.txt
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/experimental/modest/docs/reference/modest-sections.txt b/experimental/modest/docs/reference/modest-sections.txt
deleted file mode 100644 (file)
index 5857cc8..0000000
+++ /dev/null
@@ -1,180 +0,0 @@
-<SECTION>
-<FILE>modest-conf</FILE>
-<TITLE>ModestConf</TITLE>
-ModestConf
-modest_conf_new
-modest_conf_get_string
-modest_conf_get_int
-modest_conf_get_bool
-modest_conf_set_string
-modest_conf_set_int
-modest_conf_set_bool
-modest_conf_list_subkeys
-modest_conf_remove_key
-modest_conf_key_exists
-<SUBSECTION Standard>
-MODEST_CONF
-MODEST_IS_CONF
-MODEST_TYPE_CONF
-modest_conf_get_type
-MODEST_CONF_CLASS
-MODEST_IS_CONF_CLASS
-MODEST_CONF_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-account-mgr</FILE>
-<TITLE>ModestAccountMgr</TITLE>
-ModestAccountMgr
-modest_account_mgr_new
-modest_account_mgr_add_account
-modest_account_mgr_remove_account
-modest_account_mgr_account_names
-modest_account_mgr_account_exists
-modest_account_mgr_get_account_string
-modest_account_mgr_get_account_int
-modest_account_mgr_get_account_bool
-modest_account_mgr_set_account_string
-modest_account_mgr_set_account_int
-modest_account_mgr_set_account_bool
-<SUBSECTION Standard>
-MODEST_ACCOUNT_MGR
-MODEST_IS_ACCOUNT_MGR
-MODEST_TYPE_ACCOUNT_MGR
-modest_account_mgr_get_type
-MODEST_ACCOUNT_MGR_CLASS
-MODEST_IS_ACCOUNT_MGR_CLASS
-MODEST_ACCOUNT_MGR_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-window-mgr</FILE>
-ModestWindowType
-ModestOpenWindow
-<TITLE>ModestWindowMgr</TITLE>
-ModestWindowMgr
-modest_window_mgr_new
-modest_window_mgr_register
-modest_window_mgr_unregister
-modest_window_mgr_find_by_type
-modest_window_mgr_find_by_id
-<SUBSECTION Standard>
-MODEST_WINDOW_MGR
-MODEST_IS_WINDOW_MGR
-MODEST_TYPE_WINDOW_MGR
-modest_window_mgr_get_type
-MODEST_WINDOW_MGR_CLASS
-MODEST_IS_WINDOW_MGR_CLASS
-MODEST_WINDOW_MGR_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-ui</FILE>
-<TITLE>ModestUI</TITLE>
-ModestUI
-modest_ui_new
-modest_ui_show_main_window
-modest_ui_show_edit_window
-<SUBSECTION Standard>
-MODEST_UI
-MODEST_IS_UI
-MODEST_TYPE_UI
-modest_ui_get_type
-MODEST_UI_CLASS
-MODEST_IS_UI_CLASS
-MODEST_UI_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-tny-account-store</FILE>
-<TITLE>ModestTnyAccountStore</TITLE>
-ModestTnyAccountStore
-modest_tny_account_store_new
-<SUBSECTION Standard>
-MODEST_TNY_ACCOUNT_STORE
-MODEST_IS_TNY_ACCOUNT_STORE
-MODEST_TYPE_TNY_ACCOUNT_STORE
-modest_tny_account_store_get_type
-MODEST_TNY_ACCOUNT_STORE_CLASS
-MODEST_IS_TNY_ACCOUNT_STORE_CLASS
-MODEST_TNY_ACCOUNT_STORE_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-tny-folder-tree-view</FILE>
-<TITLE>ModestTnyFolderTreeView</TITLE>
-ModestTnyFolderTreeView
-modest_tny_folder_tree_view_new
-<SUBSECTION Standard>
-MODEST_TNY_FOLDER_TREE_VIEW
-MODEST_IS_TNY_FOLDER_TREE_VIEW
-MODEST_TYPE_TNY_FOLDER_TREE_VIEW
-modest_tny_folder_tree_view_get_type
-MODEST_TNY_FOLDER_TREE_VIEW_CLASS
-MODEST_IS_TNY_FOLDER_TREE_VIEW_CLASS
-MODEST_TNY_FOLDER_TREE_VIEW_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-main-window</FILE>
-<TITLE>ModestMainWindow</TITLE>
-ModestMainWindow
-modest_main_window_new
-<SUBSECTION Standard>
-MODEST_MAIN_WINDOW
-MODEST_IS_MAIN_WINDOW
-MODEST_TYPE_MAIN_WINDOW
-modest_main_window_get_type
-MODEST_MAIN_WINDOW_CLASS
-MODEST_IS_MAIN_WINDOW_CLASS
-MODEST_MAIN_WINDOW_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-edit-window</FILE>
-<TITLE>ModestEditWindow</TITLE>
-ModestEditWindow
-modest_edit_window_new
-<SUBSECTION Standard>
-MODEST_EDIT_WINDOW
-MODEST_IS_EDIT_WINDOW
-MODEST_TYPE_EDIT_WINDOW
-modest_edit_window_get_type
-MODEST_EDIT_WINDOW_CLASS
-MODEST_IS_EDIT_WINDOW_CLASS
-MODEST_EDIT_WINDOW_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>modest-conf-keys</FILE>
-MODEST_CONF_NAMESPACE
-MODEST_CONF_USE_EXT_EDITOR
-MODEST_CONF_EXT_EDITOR
-MODEST_CONF_MAIN_WINDOW_HEIGHT
-MODEST_CONF_MAIN_WINDOW_HEIGHT_DEFAULT
-MODEST_CONF_MAIN_WINDOW_WIDTH
-MODEST_CONF_MAIN_WINDOW_WIDTH_DEFAULT
-MODEST_CONF_EDIT_WINDOW_HEIGHT
-MODEST_CONF_EDIT_WINDOW_HEIGHT_DEFAULT
-MODEST_CONF_EDIT_WINDOW_WIDTH
-MODEST_CONF_EDIT_WINDOW_WIDTH_DEFAULT
-</SECTION>
-
-<SECTION>
-<FILE>modest-account-keys</FILE>
-MODEST_CONF_DEFAULT_ACCOUNT
-MODEST_ACCOUNT_NAMESPACE
-MODEST_ACCOUNT_DISPLAY_NAME
-MODEST_ACCOUNT_DEFAULT
-MODEST_ACCOUNT_TYPE
-MODEST_ACCOUNT_TYPE_STORE
-MODEST_ACCOUNT_TYPE_TRANSPORT
-MODEST_ACCOUNT_PROTO
-MODEST_ACCOUNT_PROTO_POP
-MODEST_ACCOUNT_PROTO_IMAP
-MODEST_ACCOUNT_PASSWORD
-MODEST_ACCOUNT_SERVER
-MODEST_ACCOUNT_USER
-MODEST_ACCOUNT_LEAVE_ON_SERVER
-</SECTION>
-
diff --git a/experimental/modest/docs/reference/tmpl/modest-account-keys.sgml b/experimental/modest/docs/reference/tmpl/modest-account-keys.sgml
deleted file mode 100644 (file)
index 6271adb..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-modest-account-keys
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### MACRO MODEST_CONF_DEFAULT_ACCOUNT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO MODEST_ACCOUNT_NAMESPACE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO MODEST_ACCOUNT_DISPLAY_NAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO MODEST_ACCOUNT_DEFAULT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO MODEST_ACCOUNT_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO MODEST_ACCOUNT_TYPE_STORE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO MODEST_ACCOUNT_TYPE_TRANSPORT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO MODEST_ACCOUNT_PROTO ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO MODEST_ACCOUNT_PROTO_POP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO MODEST_ACCOUNT_PROTO_IMAP ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO MODEST_ACCOUNT_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO MODEST_ACCOUNT_SERVER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO MODEST_ACCOUNT_USER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO MODEST_ACCOUNT_LEAVE_ON_SERVER ##### -->
-<para>
-
-</para>
-
-
-
diff --git a/experimental/modest/docs/reference/tmpl/modest-account-mgr.sgml b/experimental/modest/docs/reference/tmpl/modest-account-mgr.sgml
deleted file mode 100644 (file)
index 7138fa9..0000000
+++ /dev/null
@@ -1,153 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-ModestAccountMgr
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT ModestAccountMgr ##### -->
-<para>
-
-</para>
-
-@parent: 
-
-<!-- ##### FUNCTION modest_account_mgr_new ##### -->
-<para>
-
-</para>
-
-@modest_conf: 
-@Returns: 
-
-
-<!-- ##### FUNCTION modest_account_mgr_add_account ##### -->
-<para>
-
-</para>
-
-@self: 
-@name: 
-@err: 
-@Returns: 
-
-
-<!-- ##### FUNCTION modest_account_mgr_remove_account ##### -->
-<para>
-
-</para>
-
-@self: 
-@name: 
-@err: 
-@Returns: 
-
-
-<!-- ##### FUNCTION modest_account_mgr_account_names ##### -->
-<para>
-
-</para>
-
-@self: 
-@err: 
-@Returns: 
-
-
-<!-- ##### FUNCTION modest_account_mgr_account_exists ##### -->
-<para>
-
-</para>
-
-@self: 
-@name: 
-@err: 
-@Returns: 
-
-
-<!-- ##### FUNCTION modest_account_mgr_get_account_string ##### -->
-<para>
-
-</para>
-
-@self: 
-@name: 
-@key: 
-@err: 
-@Returns: 
-
-
-<!-- ##### FUNCTION modest_account_mgr_get_account_int ##### -->
-<para>
-
-</para>
-
-@self: 
-@name: 
-@key: 
-@err: 
-@Returns: 
-
-
-<!-- ##### FUNCTION modest_account_mgr_get_account_bool ##### -->
-<para>
-
-</para>
-
-@self: 
-@name: 
-@key: 
-@err: 
-@Returns: 
-
-
-<!-- ##### FUNCTION modest_account_mgr_set_account_string ##### -->
-<para>
-
-</para>
-
-@self: 
-@name: 
-@key: 
-@val: 
-@err: 
-@Returns: 
-
-
-<!-- ##### FUNCTION modest_account_mgr_set_account_int ##### -->
-<para>
-
-</para>
-
-@self: 
-@name: 
-@key: 
-@val: 
-@err: 
-@Returns: 
-
-
-<!-- ##### FUNCTION modest_account_mgr_set_account_bool ##### -->
-<para>
-
-</para>
-
-@self: 
-@name: 
-@key: 
-@val: 
-@err: 
-@Returns: 
-
-
diff --git a/experimental/modest/docs/reference/tmpl/modest-conf-defs.sgml b/experimental/modest/docs/reference/tmpl/modest-conf-defs.sgml
deleted file mode 100644 (file)
index f070c1f..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-modest-conf-defs
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### MACRO MODEST_CONF_NAMESPACE ##### -->
-<para>
-
-</para>
-
-
-
diff --git a/experimental/modest/docs/reference/tmpl/modest-conf-keys.sgml b/experimental/modest/docs/reference/tmpl/modest-conf-keys.sgml
deleted file mode 100644 (file)
index 2eed751..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-modest-conf-keys
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### MACRO MODEST_CONF_NAMESPACE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO MODEST_CONF_USE_EXT_EDITOR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO MODEST_CONF_EXT_EDITOR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO MODEST_CONF_MAIN_WINDOW_HEIGHT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO MODEST_CONF_MAIN_WINDOW_HEIGHT_DEFAULT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO MODEST_CONF_MAIN_WINDOW_WIDTH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO MODEST_CONF_MAIN_WINDOW_WIDTH_DEFAULT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO MODEST_CONF_EDIT_WINDOW_HEIGHT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO MODEST_CONF_EDIT_WINDOW_HEIGHT_DEFAULT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO MODEST_CONF_EDIT_WINDOW_WIDTH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO MODEST_CONF_EDIT_WINDOW_WIDTH_DEFAULT ##### -->
-<para>
-
-</para>
-
-
-
diff --git a/experimental/modest/docs/reference/tmpl/modest-conf.sgml b/experimental/modest/docs/reference/tmpl/modest-conf.sgml
deleted file mode 100644 (file)
index 7b6bb96..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-ModestConf
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT ModestConf ##### -->
-<para>
-
-</para>
-
-@parent: 
-
-<!-- ##### FUNCTION modest_conf_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION modest_conf_get_string ##### -->
-<para>
-
-</para>
-
-@self: 
-@key: 
-@err: 
-@Returns: 
-
-
-<!-- ##### FUNCTION modest_conf_get_int ##### -->
-<para>
-
-</para>
-
-@self: 
-@key: 
-@err: 
-@Returns: 
-
-
-<!-- ##### FUNCTION modest_conf_get_bool ##### -->
-<para>
-
-</para>
-
-@self: 
-@key: 
-@err: 
-@Returns: 
-
-
-<!-- ##### FUNCTION modest_conf_set_string ##### -->
-<para>
-
-</para>
-
-@self: 
-@key: 
-@val: 
-@err: 
-@Returns: 
-
-
-<!-- ##### FUNCTION modest_conf_set_int ##### -->
-<para>
-
-</para>
-
-@self: 
-@key: 
-@val: 
-@err: 
-@Returns: 
-
-
-<!-- ##### FUNCTION modest_conf_set_bool ##### -->
-<para>
-
-</para>
-
-@self: 
-@key: 
-@val: 
-@err: 
-@Returns: 
-
-
-<!-- ##### FUNCTION modest_conf_list_subkeys ##### -->
-<para>
-
-</para>
-
-@self: 
-@key: 
-@err: 
-@Returns: 
-
-
-<!-- ##### FUNCTION modest_conf_remove_key ##### -->
-<para>
-
-</para>
-
-@self: 
-@key: 
-@err: 
-@Returns: 
-
-
-<!-- ##### FUNCTION modest_conf_key_exists ##### -->
-<para>
-
-</para>
-
-@self: 
-@key: 
-@err: 
-@Returns: 
-
-
diff --git a/experimental/modest/docs/reference/tmpl/modest-edit-window.sgml b/experimental/modest/docs/reference/tmpl/modest-edit-window.sgml
deleted file mode 100644 (file)
index 928e777..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-ModestEditWindow
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT ModestEditWindow ##### -->
-<para>
-
-</para>
-
-@parent: 
-
-<!-- ##### FUNCTION modest_edit_window_new ##### -->
-<para>
-
-</para>
-
-@to: 
-@cc: 
-@bcc: 
-@subject: 
-@body: 
-@attachments: 
-@Returns: 
-
-
diff --git a/experimental/modest/docs/reference/tmpl/modest-main-window.sgml b/experimental/modest/docs/reference/tmpl/modest-main-window.sgml
deleted file mode 100644 (file)
index f29e1ab..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-ModestMainWindow
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT ModestMainWindow ##### -->
-<para>
-
-</para>
-
-@parent: 
-
-<!-- ##### FUNCTION modest_main_window_new ##### -->
-<para>
-
-</para>
-
-@modest_conf: 
-@modest_acc_mgr: 
-@Returns: 
-
-
diff --git a/experimental/modest/docs/reference/tmpl/modest-tny-account-store.sgml b/experimental/modest/docs/reference/tmpl/modest-tny-account-store.sgml
deleted file mode 100644 (file)
index 6739d4f..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-ModestTnyAccountStore
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT ModestTnyAccountStore ##### -->
-<para>
-
-</para>
-
-@parent: 
-
-<!-- ##### FUNCTION modest_tny_account_store_new ##### -->
-<para>
-
-</para>
-
-@modest_acc_mgr: 
-@Returns: 
-
-
diff --git a/experimental/modest/docs/reference/tmpl/modest-tny-folder-tree-view.sgml b/experimental/modest/docs/reference/tmpl/modest-tny-folder-tree-view.sgml
deleted file mode 100644 (file)
index 7754699..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-ModestTnyFolderTreeView
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT ModestTnyFolderTreeView ##### -->
-<para>
-
-</para>
-
-@parent: 
-
-<!-- ##### FUNCTION modest_tny_folder_tree_view_new ##### -->
-<para>
-
-</para>
-
-@iface: 
-@Returns: 
-
-
diff --git a/experimental/modest/docs/reference/tmpl/modest-ui.sgml b/experimental/modest/docs/reference/tmpl/modest-ui.sgml
deleted file mode 100644 (file)
index 75f3726..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-ModestUI
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT ModestUI ##### -->
-<para>
-
-</para>
-
-@parent: 
-
-<!-- ##### FUNCTION modest_ui_new ##### -->
-<para>
-
-</para>
-
-@modest_conf: 
-@Returns: 
-
-
-<!-- ##### FUNCTION modest_ui_show_main_window ##### -->
-<para>
-
-</para>
-
-@ui: 
-@Returns: 
-
-
-<!-- ##### FUNCTION modest_ui_show_edit_window ##### -->
-<para>
-
-</para>
-
-@ui: 
-@to: 
-@cc: 
-@bcc: 
-@subject: 
-@body: 
-@att: 
-@Returns: 
-
-
diff --git a/experimental/modest/docs/reference/tmpl/modest-unused.sgml b/experimental/modest/docs/reference/tmpl/modest-unused.sgml
deleted file mode 100644 (file)
index b94ed2d..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- ##### SECTION ./tmpl/modest-conf-defs.sgml:Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/modest-conf-defs.sgml:See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/modest-conf-defs.sgml:Short_Description ##### -->
-
-
-
-<!-- ##### SECTION ./tmpl/modest-conf-defs.sgml:Stability_Level ##### -->
-
-
-
-<!-- ##### SECTION ./tmpl/modest-conf-defs.sgml:Title ##### -->
-modest-conf-defs
-
-
-<!-- ##### MACRO MODEST_CONF_FOO_BAR ##### -->
-<para>
-
-</para>
-
-
diff --git a/experimental/modest/docs/reference/tmpl/modest-window-mgr.sgml b/experimental/modest/docs/reference/tmpl/modest-window-mgr.sgml
deleted file mode 100644 (file)
index de25fba..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-ModestWindowMgr
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### TYPEDEF ModestWindowType ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT ModestOpenWindow ##### -->
-<para>
-
-</para>
-
-@win: 
-@type: 
-@id: 
-
-<!-- ##### STRUCT ModestWindowMgr ##### -->
-<para>
-
-</para>
-
-@parent: 
-
-<!-- ##### FUNCTION modest_window_mgr_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION modest_window_mgr_register ##### -->
-<para>
-
-</para>
-
-@self: 
-@win: 
-@type: 
-@window_id: 
-@Returns: 
-
-
-<!-- ##### FUNCTION modest_window_mgr_unregister ##### -->
-<para>
-
-</para>
-
-@self: 
-@win: 
-@Returns: 
-
-
-<!-- ##### FUNCTION modest_window_mgr_find_by_type ##### -->
-<para>
-
-</para>
-
-@self: 
-@type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION modest_window_mgr_find_by_id ##### -->
-<para>
-
-</para>
-
-@self: 
-@window_id: 
-@Returns: 
-
-
diff --git a/experimental/modest/docs/reference/xml/modest-account-keys.xml b/experimental/modest/docs/reference/xml/modest-account-keys.xml
deleted file mode 100644 (file)
index 3999bc6..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-<refentry id="modest-modest-account-keys">
-<refmeta>
-<refentrytitle id="top_of_page">modest-account-keys</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>MODEST Library</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-<refname>modest-account-keys</refname>
-<refpurpose></refpurpose>
-<!--[<xref linkend="desc" endterm="desc.title"/>]-->
-</refnamediv>
-
-<refsynopsisdiv id="synopsis">
-<title id="synopsis.title">Synopsis</title>
-
-<synopsis>
-
-
-
-#define     <link linkend="MODEST-CONF-DEFAULT-ACCOUNT:CAPS">MODEST_CONF_DEFAULT_ACCOUNT</link>
-#define     <link linkend="MODEST-ACCOUNT-NAMESPACE:CAPS">MODEST_ACCOUNT_NAMESPACE</link>
-#define     <link linkend="MODEST-ACCOUNT-DISPLAY-NAME:CAPS">MODEST_ACCOUNT_DISPLAY_NAME</link>
-#define     <link linkend="MODEST-ACCOUNT-DEFAULT:CAPS">MODEST_ACCOUNT_DEFAULT</link>
-#define     <link linkend="MODEST-ACCOUNT-TYPE:CAPS">MODEST_ACCOUNT_TYPE</link>
-#define     <link linkend="MODEST-ACCOUNT-TYPE-STORE:CAPS">MODEST_ACCOUNT_TYPE_STORE</link>
-#define     <link linkend="MODEST-ACCOUNT-TYPE-TRANSPORT:CAPS">MODEST_ACCOUNT_TYPE_TRANSPORT</link>
-#define     <link linkend="MODEST-ACCOUNT-PROTO:CAPS">MODEST_ACCOUNT_PROTO</link>
-#define     <link linkend="MODEST-ACCOUNT-PROTO-POP:CAPS">MODEST_ACCOUNT_PROTO_POP</link>
-#define     <link linkend="MODEST-ACCOUNT-PROTO-IMAP:CAPS">MODEST_ACCOUNT_PROTO_IMAP</link>
-#define     <link linkend="MODEST-ACCOUNT-PASSWORD:CAPS">MODEST_ACCOUNT_PASSWORD</link>
-#define     <link linkend="MODEST-ACCOUNT-SERVER:CAPS">MODEST_ACCOUNT_SERVER</link>
-#define     <link linkend="MODEST-ACCOUNT-USER:CAPS">MODEST_ACCOUNT_USER</link>
-#define     <link linkend="MODEST-ACCOUNT-LEAVE-ON-SERVER:CAPS">MODEST_ACCOUNT_LEAVE_ON_SERVER</link>
-</synopsis>
-</refsynopsisdiv>
-
-
-
-
-
-
-
-
-
-<refsect1 id="desc">
-<title id="desc.title">Description</title>
-<para>
-
-</para>
-</refsect1>
-
-<refsect1 id="details">
-<title id="details.title">Details</title>
-<refsect2>
-<title><anchor id="MODEST-CONF-DEFAULT-ACCOUNT:CAPS" role="macro"/>MODEST_CONF_DEFAULT_ACCOUNT</title>
-<indexterm><primary>MODEST_CONF_DEFAULT_ACCOUNT</primary></indexterm><programlisting>#define MODEST_CONF_DEFAULT_ACCOUNT     "/default_account"
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="MODEST-ACCOUNT-NAMESPACE:CAPS" role="macro"/>MODEST_ACCOUNT_NAMESPACE</title>
-<indexterm><primary>MODEST_ACCOUNT_NAMESPACE</primary></indexterm><programlisting>#define MODEST_ACCOUNT_NAMESPACE     MODEST_CONF_NAMESPACE "/" "accounts"
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="MODEST-ACCOUNT-DISPLAY-NAME:CAPS" role="macro"/>MODEST_ACCOUNT_DISPLAY_NAME</title>
-<indexterm><primary>MODEST_ACCOUNT_DISPLAY_NAME</primary></indexterm><programlisting>#define MODEST_ACCOUNT_DISPLAY_NAME       "display_name"                  /* string */
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="MODEST-ACCOUNT-DEFAULT:CAPS" role="macro"/>MODEST_ACCOUNT_DEFAULT</title>
-<indexterm><primary>MODEST_ACCOUNT_DEFAULT</primary></indexterm><programlisting>#define MODEST_ACCOUNT_DEFAULT         "default"                       /* bool */
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="MODEST-ACCOUNT-TYPE:CAPS" role="macro"/>MODEST_ACCOUNT_TYPE</title>
-<indexterm><primary>MODEST_ACCOUNT_TYPE</primary></indexterm><programlisting>#define MODEST_ACCOUNT_TYPE            "type"                      /* string */
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="MODEST-ACCOUNT-TYPE-STORE:CAPS" role="macro"/>MODEST_ACCOUNT_TYPE_STORE</title>
-<indexterm><primary>MODEST_ACCOUNT_TYPE_STORE</primary></indexterm><programlisting>#define MODEST_ACCOUNT_TYPE_STORE      "store"
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="MODEST-ACCOUNT-TYPE-TRANSPORT:CAPS" role="macro"/>MODEST_ACCOUNT_TYPE_TRANSPORT</title>
-<indexterm><primary>MODEST_ACCOUNT_TYPE_TRANSPORT</primary></indexterm><programlisting>#define MODEST_ACCOUNT_TYPE_TRANSPORT  "transport"
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="MODEST-ACCOUNT-PROTO:CAPS" role="macro"/>MODEST_ACCOUNT_PROTO</title>
-<indexterm><primary>MODEST_ACCOUNT_PROTO</primary></indexterm><programlisting>#define MODEST_ACCOUNT_PROTO           "proto"            /* string */
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="MODEST-ACCOUNT-PROTO-POP:CAPS" role="macro"/>MODEST_ACCOUNT_PROTO_POP</title>
-<indexterm><primary>MODEST_ACCOUNT_PROTO_POP</primary></indexterm><programlisting>#define MODEST_ACCOUNT_PROTO_POP       "pop"          /* string */
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="MODEST-ACCOUNT-PROTO-IMAP:CAPS" role="macro"/>MODEST_ACCOUNT_PROTO_IMAP</title>
-<indexterm><primary>MODEST_ACCOUNT_PROTO_IMAP</primary></indexterm><programlisting>#define MODEST_ACCOUNT_PROTO_IMAP      "imap"                /* string */
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="MODEST-ACCOUNT-PASSWORD:CAPS" role="macro"/>MODEST_ACCOUNT_PASSWORD</title>
-<indexterm><primary>MODEST_ACCOUNT_PASSWORD</primary></indexterm><programlisting>#define MODEST_ACCOUNT_PASSWORD        "password"       /* string */
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="MODEST-ACCOUNT-SERVER:CAPS" role="macro"/>MODEST_ACCOUNT_SERVER</title>
-<indexterm><primary>MODEST_ACCOUNT_SERVER</primary></indexterm><programlisting>#define MODEST_ACCOUNT_SERVER          "server"          /* string */
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="MODEST-ACCOUNT-USER:CAPS" role="macro"/>MODEST_ACCOUNT_USER</title>
-<indexterm><primary>MODEST_ACCOUNT_USER</primary></indexterm><programlisting>#define MODEST_ACCOUNT_USER            "user"              /* string */
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="MODEST-ACCOUNT-LEAVE-ON-SERVER:CAPS" role="macro"/>MODEST_ACCOUNT_LEAVE_ON_SERVER</title>
-<indexterm><primary>MODEST_ACCOUNT_LEAVE_ON_SERVER</primary></indexterm><programlisting>#define     MODEST_ACCOUNT_LEAVE_ON_SERVER</programlisting>
-<para>
-
-</para></refsect2>
-
-</refsect1>
-
-
-
-
-</refentry>
diff --git a/experimental/modest/docs/reference/xml/modest-account-mgr.xml b/experimental/modest/docs/reference/xml/modest-account-mgr.xml
deleted file mode 100644 (file)
index 0fa1134..0000000
+++ /dev/null
@@ -1,395 +0,0 @@
-<refentry id="modest-ModestAccountMgr">
-<refmeta>
-<refentrytitle id="top_of_page">ModestAccountMgr</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>MODEST Library</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-<refname>ModestAccountMgr</refname>
-<refpurpose></refpurpose>
-<!--[<xref linkend="desc" endterm="desc.title"/>]-->
-</refnamediv>
-
-<refsynopsisdiv id="synopsis">
-<title id="synopsis.title">Synopsis</title>
-
-<synopsis>
-
-
-
-            <link linkend="ModestAccountMgr">ModestAccountMgr</link>;
-<link linkend="GObject">GObject</link>*    <link linkend="modest-account-mgr-new">modest_account_mgr_new</link>          (<link linkend="ModestConf">ModestConf</link> *modest_conf);
-<link linkend="gboolean">gboolean</link>    <link linkend="modest-account-mgr-add-account">modest_account_mgr_add_account</link>  (<link linkend="ModestAccountMgr">ModestAccountMgr</link> *self,
-                                             const <link linkend="gchar">gchar</link> *name,
-                                             <link linkend="GError">GError</link> **err);
-<link linkend="gboolean">gboolean</link>    <link linkend="modest-account-mgr-remove-account">modest_account_mgr_remove_account</link>
-                                            (<link linkend="ModestAccountMgr">ModestAccountMgr</link> *self,
-                                             const <link linkend="gchar">gchar</link> *name,
-                                             <link linkend="GError">GError</link> **err);
-<link linkend="GSList">GSList</link>*     <link linkend="modest-account-mgr-account-names">modest_account_mgr_account_names</link>
-                                            (<link linkend="ModestAccountMgr">ModestAccountMgr</link> *self,
-                                             <link linkend="GError">GError</link> **err);
-<link linkend="gboolean">gboolean</link>    <link linkend="modest-account-mgr-account-exists">modest_account_mgr_account_exists</link>
-                                            (<link linkend="ModestAccountMgr">ModestAccountMgr</link> *self,
-                                             const <link linkend="gchar">gchar</link> *name,
-                                             <link linkend="GError">GError</link> **err);
-<link linkend="gchar">gchar</link>*      <link linkend="modest-account-mgr-get-account-string">modest_account_mgr_get_account_string</link>
-                                            (<link linkend="ModestAccountMgr">ModestAccountMgr</link> *self,
-                                             const <link linkend="gchar">gchar</link> *name,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             <link linkend="GError">GError</link> **err);
-<link linkend="gint">gint</link>        <link linkend="modest-account-mgr-get-account-int">modest_account_mgr_get_account_int</link>
-                                            (<link linkend="ModestAccountMgr">ModestAccountMgr</link> *self,
-                                             const <link linkend="gchar">gchar</link> *name,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             <link linkend="GError">GError</link> **err);
-<link linkend="gboolean">gboolean</link>    <link linkend="modest-account-mgr-get-account-bool">modest_account_mgr_get_account_bool</link>
-                                            (<link linkend="ModestAccountMgr">ModestAccountMgr</link> *self,
-                                             const <link linkend="gchar">gchar</link> *name,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             <link linkend="GError">GError</link> **err);
-<link linkend="gboolean">gboolean</link>    <link linkend="modest-account-mgr-set-account-string">modest_account_mgr_set_account_string</link>
-                                            (<link linkend="ModestAccountMgr">ModestAccountMgr</link> *self,
-                                             const <link linkend="gchar">gchar</link> *name,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             const <link linkend="gchar">gchar</link> *val,
-                                             <link linkend="GError">GError</link> **err);
-<link linkend="gboolean">gboolean</link>    <link linkend="modest-account-mgr-set-account-int">modest_account_mgr_set_account_int</link>
-                                            (<link linkend="ModestAccountMgr">ModestAccountMgr</link> *self,
-                                             const <link linkend="gchar">gchar</link> *name,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             <link linkend="gint">gint</link> val,
-                                             <link linkend="GError">GError</link> **err);
-<link linkend="gboolean">gboolean</link>    <link linkend="modest-account-mgr-set-account-bool">modest_account_mgr_set_account_bool</link>
-                                            (<link linkend="ModestAccountMgr">ModestAccountMgr</link> *self,
-                                             const <link linkend="gchar">gchar</link> *name,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             <link linkend="gboolean">gboolean</link> val,
-                                             <link linkend="GError">GError</link> **err);
-
-</synopsis>
-</refsynopsisdiv>
-
-
-
-
-
-
-
-
-
-<refsect1 id="desc">
-<title id="desc.title">Description</title>
-<para>
-
-</para>
-</refsect1>
-
-<refsect1 id="details">
-<title id="details.title">Details</title>
-<refsect2>
-<title><anchor id="ModestAccountMgr" role="struct"/>ModestAccountMgr</title>
-<indexterm><primary>ModestAccountMgr</primary></indexterm><programlisting>typedef struct {
-        GObject parent;
-       /* insert public members, if any */
-} ModestAccountMgr;
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="modest-account-mgr-new" role="function"/>modest_account_mgr_new ()</title>
-<indexterm><primary>modest_account_mgr_new</primary></indexterm><programlisting><link linkend="GObject">GObject</link>*    modest_account_mgr_new          (<link linkend="ModestConf">ModestConf</link> *modest_conf);</programlisting>
-<para>
-</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>modest_conf</parameter>&nbsp;:</term>
-<listitem><simpara> a ModestConf instance 
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> a new ModestAccountMgr, or NULL in case of error
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="modest-account-mgr-add-account" role="function"/>modest_account_mgr_add_account ()</title>
-<indexterm><primary>modest_account_mgr_add_account</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>    modest_account_mgr_add_account  (<link linkend="ModestAccountMgr">ModestAccountMgr</link> *self,
-                                             const <link linkend="gchar">gchar</link> *name,
-                                             <link linkend="GError">GError</link> **err);</programlisting>
-<para>
-create a new account. the account with <parameter>name</parameter> should not already exist</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>self</parameter>&nbsp;:</term>
-<listitem><simpara> a ModestAccountMgr instance
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
-<listitem><simpara> the name of the account to create
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>err</parameter>&nbsp;:</term>
-<listitem><simpara> a GError ptr, or NULL to ignore.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> TRUE if the creation succeeded, FALSE otherwise,
-<parameter>err</parameter> gives details in case of error
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="modest-account-mgr-remove-account" role="function"/>modest_account_mgr_remove_account ()</title>
-<indexterm><primary>modest_account_mgr_remove_account</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>    modest_account_mgr_remove_account
-                                            (<link linkend="ModestAccountMgr">ModestAccountMgr</link> *self,
-                                             const <link linkend="gchar">gchar</link> *name,
-                                             <link linkend="GError">GError</link> **err);</programlisting>
-<para>
-remove an existing account. the account with <parameter>name</parameter> should already exist</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>self</parameter>&nbsp;:</term>
-<listitem><simpara> a ModestAccountMgr instance
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
-<listitem><simpara> the name of the account to remove
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>err</parameter>&nbsp;:</term>
-<listitem><simpara> a GError ptr, or NULL to ignore.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> TRUE if the creation succeeded, FALSE otherwise,
-<parameter>err</parameter> gives details in case of error
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="modest-account-mgr-account-names" role="function"/>modest_account_mgr_account_names ()</title>
-<indexterm><primary>modest_account_mgr_account_names</primary></indexterm><programlisting><link linkend="GSList">GSList</link>*     modest_account_mgr_account_names
-                                            (<link linkend="ModestAccountMgr">ModestAccountMgr</link> *self,
-                                             <link linkend="GError">GError</link> **err);</programlisting>
-<para>
-list all account names</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>self</parameter>&nbsp;:</term>
-<listitem><simpara> a ModestAccountMgr instance
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>err</parameter>&nbsp;:</term>
-<listitem><simpara> a GError ptr, or NULL to ignore.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> a newly allocated list of account names, or NULL in case of error or
-if there are no accounts. The caller must free the returned GSList
-<parameter>err</parameter> gives details in case of error
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="modest-account-mgr-account-exists" role="function"/>modest_account_mgr_account_exists ()</title>
-<indexterm><primary>modest_account_mgr_account_exists</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>    modest_account_mgr_account_exists
-                                            (<link linkend="ModestAccountMgr">ModestAccountMgr</link> *self,
-                                             const <link linkend="gchar">gchar</link> *name,
-                                             <link linkend="GError">GError</link> **err);</programlisting>
-<para>
-check whether account <parameter>name</parameter> exists</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>self</parameter>&nbsp;:</term>
-<listitem><simpara> a ModestAccountMgr instance
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>err</parameter>&nbsp;:</term>
-<listitem><simpara> a GError ptr, or NULL to ignore.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> TRUE if the account exists, FALSE otherwise (or in case of error)
-<parameter>err</parameter> gives details in case of error
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="modest-account-mgr-get-account-string" role="function"/>modest_account_mgr_get_account_string ()</title>
-<indexterm><primary>modest_account_mgr_get_account_string</primary></indexterm><programlisting><link linkend="gchar">gchar</link>*      modest_account_mgr_get_account_string
-                                            (<link linkend="ModestAccountMgr">ModestAccountMgr</link> *self,
-                                             const <link linkend="gchar">gchar</link> *name,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             <link linkend="GError">GError</link> **err);</programlisting>
-<para>
-get a config string from some account</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>self</parameter>&nbsp;:</term>
-<listitem><simpara> self a ModestAccountMgr instance
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
-<listitem><simpara> the name of the account
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
-<listitem><simpara> the key of the value to retrieve
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>err</parameter>&nbsp;:</term>
-<listitem><simpara> a GError ptr, or NULL to ignore.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> a newly allocated string with the value for the key,
-or NULL in case of error. <parameter>err</parameter> gives details in case of error
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="modest-account-mgr-get-account-int" role="function"/>modest_account_mgr_get_account_int ()</title>
-<indexterm><primary>modest_account_mgr_get_account_int</primary></indexterm><programlisting><link linkend="gint">gint</link>        modest_account_mgr_get_account_int
-                                            (<link linkend="ModestAccountMgr">ModestAccountMgr</link> *self,
-                                             const <link linkend="gchar">gchar</link> *name,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             <link linkend="GError">GError</link> **err);</programlisting>
-<para>
-get a config int from some account</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>self</parameter>&nbsp;:</term>
-<listitem><simpara> self a ModestAccountMgr instance
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
-<listitem><simpara> the name of the account
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
-<listitem><simpara> the key of the value to retrieve
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>err</parameter>&nbsp;:</term>
-<listitem><simpara> a GError ptr, or NULL to ignore.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> an integer with the value for the key, or -1 in case of
-error (but of course -1 does not necessarily imply an error)
-<parameter>err</parameter> gives details in case of error
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="modest-account-mgr-get-account-bool" role="function"/>modest_account_mgr_get_account_bool ()</title>
-<indexterm><primary>modest_account_mgr_get_account_bool</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>    modest_account_mgr_get_account_bool
-                                            (<link linkend="ModestAccountMgr">ModestAccountMgr</link> *self,
-                                             const <link linkend="gchar">gchar</link> *name,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             <link linkend="GError">GError</link> **err);</programlisting>
-<para>
-get a config boolean from some account</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>self</parameter>&nbsp;:</term>
-<listitem><simpara> self a ModestAccountMgr instance
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
-<listitem><simpara> the name of the account
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
-<listitem><simpara> the key of the value to retrieve
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>err</parameter>&nbsp;:</term>
-<listitem><simpara> a GError ptr, or NULL to ignore.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> an boolean with the value for the key, or FALSE in case of
-error (but of course FALSE does not necessarily imply an error)
-<parameter>err</parameter> gives details in case of error
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="modest-account-mgr-set-account-string" role="function"/>modest_account_mgr_set_account_string ()</title>
-<indexterm><primary>modest_account_mgr_set_account_string</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>    modest_account_mgr_set_account_string
-                                            (<link linkend="ModestAccountMgr">ModestAccountMgr</link> *self,
-                                             const <link linkend="gchar">gchar</link> *name,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             const <link linkend="gchar">gchar</link> *val,
-                                             <link linkend="GError">GError</link> **err);</programlisting>
-<para>
-set a config string for some account</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>self</parameter>&nbsp;:</term>
-<listitem><simpara> self a ModestAccountMgr instance
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
-<listitem><simpara> the name of the account
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
-<listitem><simpara> the key of the value to set
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>val</parameter>&nbsp;:</term>
-<listitem><simpara> the value to set
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>err</parameter>&nbsp;:</term>
-<listitem><simpara> a GError ptr, or NULL to ignore.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> TRUE if setting the value succeeded, or FALSE in case of error.
-<parameter>err</parameter> gives details in case of error
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="modest-account-mgr-set-account-int" role="function"/>modest_account_mgr_set_account_int ()</title>
-<indexterm><primary>modest_account_mgr_set_account_int</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>    modest_account_mgr_set_account_int
-                                            (<link linkend="ModestAccountMgr">ModestAccountMgr</link> *self,
-                                             const <link linkend="gchar">gchar</link> *name,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             <link linkend="gint">gint</link> val,
-                                             <link linkend="GError">GError</link> **err);</programlisting>
-<para>
-set a config int for some account</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>self</parameter>&nbsp;:</term>
-<listitem><simpara> self a ModestAccountMgr instance
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
-<listitem><simpara> the name of the account
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
-<listitem><simpara> the key of the value to set
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>val</parameter>&nbsp;:</term>
-<listitem><simpara> the value to set
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>err</parameter>&nbsp;:</term>
-<listitem><simpara> a GError ptr, or NULL to ignore.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> TRUE if setting the value succeeded, or FALSE in case of error.
-<parameter>err</parameter> gives details in case of error
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="modest-account-mgr-set-account-bool" role="function"/>modest_account_mgr_set_account_bool ()</title>
-<indexterm><primary>modest_account_mgr_set_account_bool</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>    modest_account_mgr_set_account_bool
-                                            (<link linkend="ModestAccountMgr">ModestAccountMgr</link> *self,
-                                             const <link linkend="gchar">gchar</link> *name,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             <link linkend="gboolean">gboolean</link> val,
-                                             <link linkend="GError">GError</link> **err);</programlisting>
-<para>
-set a config bool for some account</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>self</parameter>&nbsp;:</term>
-<listitem><simpara> self a ModestAccountMgr instance
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
-<listitem><simpara> the name of the account
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
-<listitem><simpara> the key of the value to set
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>val</parameter>&nbsp;:</term>
-<listitem><simpara> the value to set
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>err</parameter>&nbsp;:</term>
-<listitem><simpara> a GError ptr, or NULL to ignore.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> TRUE if setting the value succeeded, or FALSE in case of error.
-<parameter>err</parameter> gives details in case of error
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-
-</refsect1>
-
-
-
-
-</refentry>
diff --git a/experimental/modest/docs/reference/xml/modest-conf-defs.xml b/experimental/modest/docs/reference/xml/modest-conf-defs.xml
deleted file mode 100644 (file)
index 82d597c..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<refentry id="modest-modest-conf-defs">
-<refmeta>
-<refentrytitle id="top_of_page">modest-conf-defs</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>MODEST Library</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-<refname>modest-conf-defs</refname>
-<refpurpose></refpurpose>
-<!--[<xref linkend="desc" endterm="desc.title"/>]-->
-</refnamediv>
-
-<refsynopsisdiv id="synopsis">
-<title id="synopsis.title">Synopsis</title>
-
-<synopsis>
-
-
-
-#define     <link linkend="MODEST-CONF-NAMESPACE:CAPS">MODEST_CONF_NAMESPACE</link>
-</synopsis>
-</refsynopsisdiv>
-
-
-
-
-
-
-
-
-
-<refsect1 id="desc">
-<title id="desc.title">Description</title>
-<para>
-
-</para>
-</refsect1>
-
-<refsect1 id="details">
-<title id="details.title">Details</title>
-<refsect2>
-<title><anchor id="MODEST-CONF-NAMESPACE:CAPS" role="macro"/>MODEST_CONF_NAMESPACE</title>
-<indexterm><primary>MODEST_CONF_NAMESPACE</primary></indexterm><programlisting>#define MODEST_CONF_NAMESPACE           "/apps/modest"
-</programlisting>
-<para>
-
-</para></refsect2>
-
-</refsect1>
-
-
-
-
-</refentry>
diff --git a/experimental/modest/docs/reference/xml/modest-conf-keys.xml b/experimental/modest/docs/reference/xml/modest-conf-keys.xml
deleted file mode 100644 (file)
index a4d64a3..0000000
+++ /dev/null
@@ -1,135 +0,0 @@
-<refentry id="modest-modest-conf-keys">
-<refmeta>
-<refentrytitle id="top_of_page">modest-conf-keys</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>MODEST Library</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-<refname>modest-conf-keys</refname>
-<refpurpose></refpurpose>
-<!--[<xref linkend="desc" endterm="desc.title"/>]-->
-</refnamediv>
-
-<refsynopsisdiv id="synopsis">
-<title id="synopsis.title">Synopsis</title>
-
-<synopsis>
-
-
-
-#define     <link linkend="MODEST-CONF-NAMESPACE:CAPS">MODEST_CONF_NAMESPACE</link>
-#define     <link linkend="MODEST-CONF-USE-EXT-EDITOR:CAPS">MODEST_CONF_USE_EXT_EDITOR</link>
-#define     <link linkend="MODEST-CONF-EXT-EDITOR:CAPS">MODEST_CONF_EXT_EDITOR</link>
-#define     <link linkend="MODEST-CONF-MAIN-WINDOW-HEIGHT:CAPS">MODEST_CONF_MAIN_WINDOW_HEIGHT</link>
-#define     <link linkend="MODEST-CONF-MAIN-WINDOW-HEIGHT-DEFAULT:CAPS">MODEST_CONF_MAIN_WINDOW_HEIGHT_DEFAULT</link>
-#define     <link linkend="MODEST-CONF-MAIN-WINDOW-WIDTH:CAPS">MODEST_CONF_MAIN_WINDOW_WIDTH</link>
-#define     <link linkend="MODEST-CONF-MAIN-WINDOW-WIDTH-DEFAULT:CAPS">MODEST_CONF_MAIN_WINDOW_WIDTH_DEFAULT</link>
-#define     <link linkend="MODEST-CONF-EDIT-WINDOW-HEIGHT:CAPS">MODEST_CONF_EDIT_WINDOW_HEIGHT</link>
-#define     <link linkend="MODEST-CONF-EDIT-WINDOW-HEIGHT-DEFAULT:CAPS">MODEST_CONF_EDIT_WINDOW_HEIGHT_DEFAULT</link>
-#define     <link linkend="MODEST-CONF-EDIT-WINDOW-WIDTH:CAPS">MODEST_CONF_EDIT_WINDOW_WIDTH</link>
-#define     <link linkend="MODEST-CONF-EDIT-WINDOW-WIDTH-DEFAULT:CAPS">MODEST_CONF_EDIT_WINDOW_WIDTH_DEFAULT</link>
-</synopsis>
-</refsynopsisdiv>
-
-
-
-
-
-
-
-
-
-<refsect1 id="desc">
-<title id="desc.title">Description</title>
-<para>
-
-</para>
-</refsect1>
-
-<refsect1 id="details">
-<title id="details.title">Details</title>
-<refsect2>
-<title><anchor id="MODEST-CONF-NAMESPACE:CAPS" role="macro"/>MODEST_CONF_NAMESPACE</title>
-<indexterm><primary>MODEST_CONF_NAMESPACE</primary></indexterm><programlisting>#define MODEST_CONF_NAMESPACE           "/apps/modest"
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="MODEST-CONF-USE-EXT-EDITOR:CAPS" role="macro"/>MODEST_CONF_USE_EXT_EDITOR</title>
-<indexterm><primary>MODEST_CONF_USE_EXT_EDITOR</primary></indexterm><programlisting>#define MODEST_CONF_USE_EXT_EDITOR   MODEST_CONF_NAMESPACE "/use_ext_editor"         /* boolean */
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="MODEST-CONF-EXT-EDITOR:CAPS" role="macro"/>MODEST_CONF_EXT_EDITOR</title>
-<indexterm><primary>MODEST_CONF_EXT_EDITOR</primary></indexterm><programlisting>#define MODEST_CONF_EXT_EDITOR           MODEST_CONF_NAMESPACE "/ext_editor"     /* string */
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="MODEST-CONF-MAIN-WINDOW-HEIGHT:CAPS" role="macro"/>MODEST_CONF_MAIN_WINDOW_HEIGHT</title>
-<indexterm><primary>MODEST_CONF_MAIN_WINDOW_HEIGHT</primary></indexterm><programlisting>#define MODEST_CONF_MAIN_WINDOW_HEIGHT   MODEST_CONF_NAMESPACE "/main_window_height"    /* int */
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="MODEST-CONF-MAIN-WINDOW-HEIGHT-DEFAULT:CAPS" role="macro"/>MODEST_CONF_MAIN_WINDOW_HEIGHT_DEFAULT</title>
-<indexterm><primary>MODEST_CONF_MAIN_WINDOW_HEIGHT_DEFAULT</primary></indexterm><programlisting>#define MODEST_CONF_MAIN_WINDOW_HEIGHT_DEFAULT 800                                       /* int */
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="MODEST-CONF-MAIN-WINDOW-WIDTH:CAPS" role="macro"/>MODEST_CONF_MAIN_WINDOW_WIDTH</title>
-<indexterm><primary>MODEST_CONF_MAIN_WINDOW_WIDTH</primary></indexterm><programlisting>#define MODEST_CONF_MAIN_WINDOW_WIDTH     MODEST_CONF_NAMESPACE "/main_window_width"     /* int */
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="MODEST-CONF-MAIN-WINDOW-WIDTH-DEFAULT:CAPS" role="macro"/>MODEST_CONF_MAIN_WINDOW_WIDTH_DEFAULT</title>
-<indexterm><primary>MODEST_CONF_MAIN_WINDOW_WIDTH_DEFAULT</primary></indexterm><programlisting>#define MODEST_CONF_MAIN_WINDOW_WIDTH_DEFAULT  480
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="MODEST-CONF-EDIT-WINDOW-HEIGHT:CAPS" role="macro"/>MODEST_CONF_EDIT_WINDOW_HEIGHT</title>
-<indexterm><primary>MODEST_CONF_EDIT_WINDOW_HEIGHT</primary></indexterm><programlisting>#define MODEST_CONF_EDIT_WINDOW_HEIGHT   MODEST_CONF_NAMESPACE "/edit_window_height"    /* int */
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="MODEST-CONF-EDIT-WINDOW-HEIGHT-DEFAULT:CAPS" role="macro"/>MODEST_CONF_EDIT_WINDOW_HEIGHT_DEFAULT</title>
-<indexterm><primary>MODEST_CONF_EDIT_WINDOW_HEIGHT_DEFAULT</primary></indexterm><programlisting>#define MODEST_CONF_EDIT_WINDOW_HEIGHT_DEFAULT 800                                       /* int */
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="MODEST-CONF-EDIT-WINDOW-WIDTH:CAPS" role="macro"/>MODEST_CONF_EDIT_WINDOW_WIDTH</title>
-<indexterm><primary>MODEST_CONF_EDIT_WINDOW_WIDTH</primary></indexterm><programlisting>#define MODEST_CONF_EDIT_WINDOW_WIDTH     MODEST_CONF_NAMESPACE "/edit_window_width"     /* int */
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="MODEST-CONF-EDIT-WINDOW-WIDTH-DEFAULT:CAPS" role="macro"/>MODEST_CONF_EDIT_WINDOW_WIDTH_DEFAULT</title>
-<indexterm><primary>MODEST_CONF_EDIT_WINDOW_WIDTH_DEFAULT</primary></indexterm><programlisting>#define MODEST_CONF_EDIT_WINDOW_WIDTH_DEFAULT  480
-</programlisting>
-<para>
-
-</para></refsect2>
-
-</refsect1>
-
-
-
-
-</refentry>
diff --git a/experimental/modest/docs/reference/xml/modest-conf.xml b/experimental/modest/docs/reference/xml/modest-conf.xml
deleted file mode 100644 (file)
index b4f9e7d..0000000
+++ /dev/null
@@ -1,323 +0,0 @@
-<refentry id="modest-ModestConf">
-<refmeta>
-<refentrytitle id="top_of_page">ModestConf</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>MODEST Library</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-<refname>ModestConf</refname>
-<refpurpose></refpurpose>
-<!--[<xref linkend="desc" endterm="desc.title"/>]-->
-</refnamediv>
-
-<refsynopsisdiv id="synopsis">
-<title id="synopsis.title">Synopsis</title>
-
-<synopsis>
-
-
-
-            <link linkend="ModestConf">ModestConf</link>;
-<link linkend="GObject">GObject</link>*    <link linkend="modest-conf-new">modest_conf_new</link>                 (void);
-<link linkend="gchar">gchar</link>*      <link linkend="modest-conf-get-string">modest_conf_get_string</link>          (<link linkend="ModestConf">ModestConf</link> *self,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             <link linkend="GError">GError</link> **err);
-<link linkend="int">int</link>         <link linkend="modest-conf-get-int">modest_conf_get_int</link>             (<link linkend="ModestConf">ModestConf</link> *self,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             <link linkend="GError">GError</link> **err);
-<link linkend="gboolean">gboolean</link>    <link linkend="modest-conf-get-bool">modest_conf_get_bool</link>            (<link linkend="ModestConf">ModestConf</link> *self,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             <link linkend="GError">GError</link> **err);
-<link linkend="gboolean">gboolean</link>    <link linkend="modest-conf-set-string">modest_conf_set_string</link>          (<link linkend="ModestConf">ModestConf</link> *self,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             const <link linkend="gchar">gchar</link> *val,
-                                             <link linkend="GError">GError</link> **err);
-<link linkend="gboolean">gboolean</link>    <link linkend="modest-conf-set-int">modest_conf_set_int</link>             (<link linkend="ModestConf">ModestConf</link> *self,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             <link linkend="int">int</link> val,
-                                             <link linkend="GError">GError</link> **err);
-<link linkend="gboolean">gboolean</link>    <link linkend="modest-conf-set-bool">modest_conf_set_bool</link>            (<link linkend="ModestConf">ModestConf</link> *self,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             <link linkend="gboolean">gboolean</link> val,
-                                             <link linkend="GError">GError</link> **err);
-<link linkend="GSList">GSList</link>*     <link linkend="modest-conf-list-subkeys">modest_conf_list_subkeys</link>        (<link linkend="ModestConf">ModestConf</link> *self,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             <link linkend="GError">GError</link> **err);
-<link linkend="gboolean">gboolean</link>    <link linkend="modest-conf-remove-key">modest_conf_remove_key</link>          (<link linkend="ModestConf">ModestConf</link> *self,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             <link linkend="GError">GError</link> **err);
-<link linkend="gboolean">gboolean</link>    <link linkend="modest-conf-key-exists">modest_conf_key_exists</link>          (<link linkend="ModestConf">ModestConf</link> *self,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             <link linkend="GError">GError</link> **err);
-
-</synopsis>
-</refsynopsisdiv>
-
-
-
-
-
-
-
-
-
-<refsect1 id="desc">
-<title id="desc.title">Description</title>
-<para>
-
-</para>
-</refsect1>
-
-<refsect1 id="details">
-<title id="details.title">Details</title>
-<refsect2>
-<title><anchor id="ModestConf" role="struct"/>ModestConf</title>
-<indexterm><primary>ModestConf</primary></indexterm><programlisting>typedef struct {
-        GObject parent;
-} ModestConf;
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="modest-conf-new" role="function"/>modest_conf_new ()</title>
-<indexterm><primary>modest_conf_new</primary></indexterm><programlisting><link linkend="GObject">GObject</link>*    modest_conf_new                 (void);</programlisting>
-<para>
-create a new modest ModestConf object.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> a new ModestConf instance, or NULL in case
-of any error
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="modest-conf-get-string" role="function"/>modest_conf_get_string ()</title>
-<indexterm><primary>modest_conf_get_string</primary></indexterm><programlisting><link linkend="gchar">gchar</link>*      modest_conf_get_string          (<link linkend="ModestConf">ModestConf</link> *self,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             <link linkend="GError">GError</link> **err);</programlisting>
-<para>
-get a string from the configuration system</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>self</parameter>&nbsp;:</term>
-<listitem><simpara> self a ModestConf instance
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
-<listitem><simpara> the key of the value to retrieve
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>err</parameter>&nbsp;:</term>
-<listitem><simpara> a GError ptr, or NULL to ignore.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> a newly allocated string with the value for the key,
-or NULL in case of error. <parameter>err</parameter> gives details in case of error
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="modest-conf-get-int" role="function"/>modest_conf_get_int ()</title>
-<indexterm><primary>modest_conf_get_int</primary></indexterm><programlisting><link linkend="int">int</link>         modest_conf_get_int             (<link linkend="ModestConf">ModestConf</link> *self,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             <link linkend="GError">GError</link> **err);</programlisting>
-<para>
-get an integer from the configuration system</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>self</parameter>&nbsp;:</term>
-<listitem><simpara> self a ModestConf instance
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
-<listitem><simpara> the key of the value to retrieve
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>err</parameter>&nbsp;:</term>
-<listitem><simpara> a GError ptr, or NULL to ignore.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> an integer with the value for the key, or -1 in case of error
-(of course, -1 can also be returned in non-error cases).
-<parameter>err</parameter> gives details in case of error
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="modest-conf-get-bool" role="function"/>modest_conf_get_bool ()</title>
-<indexterm><primary>modest_conf_get_bool</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>    modest_conf_get_bool            (<link linkend="ModestConf">ModestConf</link> *self,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             <link linkend="GError">GError</link> **err);</programlisting>
-<para>
-get a boolean value from the configuration system</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>self</parameter>&nbsp;:</term>
-<listitem><simpara> self a ModestConf instance
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
-<listitem><simpara> the key of the value to retrieve
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>err</parameter>&nbsp;:</term>
-<listitem><simpara> a GError ptr, or NULL to ignore.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> a boolean value with the value for the key, or -1 in case of error
-(of course, -1 can also be returned in non-error cases).
-<parameter>err</parameter> gives details in case of error
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="modest-conf-set-string" role="function"/>modest_conf_set_string ()</title>
-<indexterm><primary>modest_conf_set_string</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>    modest_conf_set_string          (<link linkend="ModestConf">ModestConf</link> *self,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             const <link linkend="gchar">gchar</link> *val,
-                                             <link linkend="GError">GError</link> **err);</programlisting>
-<para>
-store a string value in the configuration system</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>self</parameter>&nbsp;:</term>
-<listitem><simpara> a ModestConf instance
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
-<listitem><simpara> the key of the value to set
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>val</parameter>&nbsp;:</term>
-<listitem><simpara> the value to set
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>err</parameter>&nbsp;:</term>
-<listitem><simpara> a GError ptr, or NULL if not interested.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> TRUE if succeeded or FALSE in case of error.
-<parameter>err</parameter> gives details in case of error
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="modest-conf-set-int" role="function"/>modest_conf_set_int ()</title>
-<indexterm><primary>modest_conf_set_int</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>    modest_conf_set_int             (<link linkend="ModestConf">ModestConf</link> *self,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             <link linkend="int">int</link> val,
-                                             <link linkend="GError">GError</link> **err);</programlisting>
-<para>
-store an integer value in the configuration system</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>self</parameter>&nbsp;:</term>
-<listitem><simpara> a ModestConf instance
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
-<listitem><simpara> the key of the value to set
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>val</parameter>&nbsp;:</term>
-<listitem><simpara> the value to set
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>err</parameter>&nbsp;:</term>
-<listitem><simpara> a GError ptr, or NULL if not interested.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> TRUE if succeeded or FALSE in case of error.
-<parameter>err</parameter> gives details in case of error
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="modest-conf-set-bool" role="function"/>modest_conf_set_bool ()</title>
-<indexterm><primary>modest_conf_set_bool</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>    modest_conf_set_bool            (<link linkend="ModestConf">ModestConf</link> *self,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             <link linkend="gboolean">gboolean</link> val,
-                                             <link linkend="GError">GError</link> **err);</programlisting>
-<para>
-store a boolean value in the configuration system</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>self</parameter>&nbsp;:</term>
-<listitem><simpara> a ModestConf instance
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
-<listitem><simpara> the key of the value to set
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>val</parameter>&nbsp;:</term>
-<listitem><simpara> the value to set
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>err</parameter>&nbsp;:</term>
-<listitem><simpara> a GError ptr, or NULL if not interested.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> TRUE if succeeded or FALSE in case of error.
-<parameter>err</parameter> gives details in case of error
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="modest-conf-list-subkeys" role="function"/>modest_conf_list_subkeys ()</title>
-<indexterm><primary>modest_conf_list_subkeys</primary></indexterm><programlisting><link linkend="GSList">GSList</link>*     modest_conf_list_subkeys        (<link linkend="ModestConf">ModestConf</link> *self,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             <link linkend="GError">GError</link> **err);</programlisting>
-<para>
-list all the subkeys for a given key</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>self</parameter>&nbsp;:</term>
-<listitem><simpara> a ModestConf instance
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
-<listitem><simpara> the key whose subkeys will be listed
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>err</parameter>&nbsp;:</term>
-<listitem><simpara> a GError ptr, or NULL if not interested.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> a newly allocated list or NULL in case of error
-the returned GSList must be freed by the caller
-<parameter>err</parameter> gives details in case of error
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="modest-conf-remove-key" role="function"/>modest_conf_remove_key ()</title>
-<indexterm><primary>modest_conf_remove_key</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>    modest_conf_remove_key          (<link linkend="ModestConf">ModestConf</link> *self,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             <link linkend="GError">GError</link> **err);</programlisting>
-<para>
-attempts to remove <parameter>key</parameter> and all its subkeys</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>self</parameter>&nbsp;:</term>
-<listitem><simpara> a ModestConf instance
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
-<listitem><simpara> the key to remove
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>err</parameter>&nbsp;:</term>
-<listitem><simpara> a GError ptr, or NULL if not interested.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> TRUE if succeeded or FALSE in case of error.
-<parameter>err</parameter> gives details in case of error
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="modest-conf-key-exists" role="function"/>modest_conf_key_exists ()</title>
-<indexterm><primary>modest_conf_key_exists</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>    modest_conf_key_exists          (<link linkend="ModestConf">ModestConf</link> *self,
-                                             const <link linkend="gchar">gchar</link> *key,
-                                             <link linkend="GError">GError</link> **err);</programlisting>
-<para>
-checks if the given key exists in the configuration system</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>self</parameter>&nbsp;:</term>
-<listitem><simpara> a ModestConf instance
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
-<listitem><simpara> the key to remove
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>err</parameter>&nbsp;:</term>
-<listitem><simpara> a GError ptr, or NULL if not interested.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> TRUE if exists, FALSE otherwise.
-<parameter>err</parameter> gives details in case of error
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-
-</refsect1>
-
-
-
-
-</refentry>
diff --git a/experimental/modest/docs/reference/xml/modest-edit-window.xml b/experimental/modest/docs/reference/xml/modest-edit-window.xml
deleted file mode 100644 (file)
index b2497e9..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-<refentry id="modest-ModestEditWindow">
-<refmeta>
-<refentrytitle id="top_of_page">ModestEditWindow</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>MODEST Library</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-<refname>ModestEditWindow</refname>
-<refpurpose></refpurpose>
-<!--[<xref linkend="desc" endterm="desc.title"/>]-->
-</refnamediv>
-
-<refsynopsisdiv id="synopsis">
-<title id="synopsis.title">Synopsis</title>
-
-<synopsis>
-
-
-
-            <link linkend="ModestEditWindow">ModestEditWindow</link>;
-<link linkend="GtkWidget">GtkWidget</link>*  <link linkend="modest-edit-window-new">modest_edit_window_new</link>          (const <link linkend="gchar">gchar</link> *to,
-                                             const <link linkend="gchar">gchar</link> *cc,
-                                             const <link linkend="gchar">gchar</link> *bcc,
-                                             const <link linkend="gchar">gchar</link> *subject,
-                                             const <link linkend="gchar">gchar</link> *body,
-                                             const <link linkend="GSList">GSList</link> *attachments);
-
-</synopsis>
-</refsynopsisdiv>
-
-
-
-
-
-
-
-
-
-<refsect1 id="desc">
-<title id="desc.title">Description</title>
-<para>
-
-</para>
-</refsect1>
-
-<refsect1 id="details">
-<title id="details.title">Details</title>
-<refsect2>
-<title><anchor id="ModestEditWindow" role="struct"/>ModestEditWindow</title>
-<indexterm><primary>ModestEditWindow</primary></indexterm><programlisting>typedef struct {
-        GtkWindow parent;      
-} ModestEditWindow;
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="modest-edit-window-new" role="function"/>modest_edit_window_new ()</title>
-<indexterm><primary>modest_edit_window_new</primary></indexterm><programlisting><link linkend="GtkWidget">GtkWidget</link>*  modest_edit_window_new          (const <link linkend="gchar">gchar</link> *to,
-                                             const <link linkend="gchar">gchar</link> *cc,
-                                             const <link linkend="gchar">gchar</link> *bcc,
-                                             const <link linkend="gchar">gchar</link> *subject,
-                                             const <link linkend="gchar">gchar</link> *body,
-                                             const <link linkend="GSList">GSList</link> *attachments);</programlisting>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>to</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>cc</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>bcc</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>subject</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>body</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>attachments</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara>
-
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-
-</refsect1>
-
-
-
-
-</refentry>
diff --git a/experimental/modest/docs/reference/xml/modest-main-window.xml b/experimental/modest/docs/reference/xml/modest-main-window.xml
deleted file mode 100644 (file)
index a70b7fb..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-<refentry id="modest-ModestMainWindow">
-<refmeta>
-<refentrytitle id="top_of_page">ModestMainWindow</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>MODEST Library</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-<refname>ModestMainWindow</refname>
-<refpurpose></refpurpose>
-<!--[<xref linkend="desc" endterm="desc.title"/>]-->
-</refnamediv>
-
-<refsynopsisdiv id="synopsis">
-<title id="synopsis.title">Synopsis</title>
-
-<synopsis>
-
-
-
-            <link linkend="ModestMainWindow">ModestMainWindow</link>;
-<link linkend="GtkWidget">GtkWidget</link>*  <link linkend="modest-main-window-new">modest_main_window_new</link>          (<link linkend="ModestConf">ModestConf</link> *modest_conf,
-                                             <link linkend="ModestAccountMgr">ModestAccountMgr</link> *modest_acc_mgr);
-
-</synopsis>
-</refsynopsisdiv>
-
-
-
-
-
-
-
-
-
-<refsect1 id="desc">
-<title id="desc.title">Description</title>
-<para>
-
-</para>
-</refsect1>
-
-<refsect1 id="details">
-<title id="details.title">Details</title>
-<refsect2>
-<title><anchor id="ModestMainWindow" role="struct"/>ModestMainWindow</title>
-<indexterm><primary>ModestMainWindow</primary></indexterm><programlisting>typedef struct {
-        GtkWindow parent;
-       /* insert public members, if any */
-} ModestMainWindow;
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="modest-main-window-new" role="function"/>modest_main_window_new ()</title>
-<indexterm><primary>modest_main_window_new</primary></indexterm><programlisting><link linkend="GtkWidget">GtkWidget</link>*  modest_main_window_new          (<link linkend="ModestConf">ModestConf</link> *modest_conf,
-                                             <link linkend="ModestAccountMgr">ModestAccountMgr</link> *modest_acc_mgr);</programlisting>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>modest_conf</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>modest_acc_mgr</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara>
-
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-
-</refsect1>
-
-
-
-
-</refentry>
diff --git a/experimental/modest/docs/reference/xml/modest-tny-account-store.xml b/experimental/modest/docs/reference/xml/modest-tny-account-store.xml
deleted file mode 100644 (file)
index 4f18c40..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-<refentry id="modest-ModestTnyAccountStore">
-<refmeta>
-<refentrytitle id="top_of_page">ModestTnyAccountStore</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>MODEST Library</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-<refname>ModestTnyAccountStore</refname>
-<refpurpose></refpurpose>
-<!--[<xref linkend="desc" endterm="desc.title"/>]-->
-</refnamediv>
-
-<refsynopsisdiv id="synopsis">
-<title id="synopsis.title">Synopsis</title>
-
-<synopsis>
-
-
-
-            <link linkend="ModestTnyAccountStore">ModestTnyAccountStore</link>;
-<link linkend="GObject">GObject</link>*    <link linkend="modest-tny-account-store-new">modest_tny_account_store_new</link>    (<link linkend="ModestAccountMgr">ModestAccountMgr</link> *modest_acc_mgr);
-
-</synopsis>
-</refsynopsisdiv>
-
-
-
-
-
-
-
-
-
-<refsect1 id="desc">
-<title id="desc.title">Description</title>
-<para>
-
-</para>
-</refsect1>
-
-<refsect1 id="details">
-<title id="details.title">Details</title>
-<refsect2>
-<title><anchor id="ModestTnyAccountStore" role="struct"/>ModestTnyAccountStore</title>
-<indexterm><primary>ModestTnyAccountStore</primary></indexterm><programlisting>typedef struct {
-        GObject parent;
-       /* insert public members, if any */
-} ModestTnyAccountStore;
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="modest-tny-account-store-new" role="function"/>modest_tny_account_store_new ()</title>
-<indexterm><primary>modest_tny_account_store_new</primary></indexterm><programlisting><link linkend="GObject">GObject</link>*    modest_tny_account_store_new    (<link linkend="ModestAccountMgr">ModestAccountMgr</link> *modest_acc_mgr);</programlisting>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>modest_acc_mgr</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara>
-
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-
-</refsect1>
-
-
-
-
-</refentry>
diff --git a/experimental/modest/docs/reference/xml/modest-tny-folder-tree-view.xml b/experimental/modest/docs/reference/xml/modest-tny-folder-tree-view.xml
deleted file mode 100644 (file)
index a47f0c1..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-<refentry id="modest-ModestTnyFolderTreeView">
-<refmeta>
-<refentrytitle id="top_of_page">ModestTnyFolderTreeView</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>MODEST Library</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-<refname>ModestTnyFolderTreeView</refname>
-<refpurpose></refpurpose>
-<!--[<xref linkend="desc" endterm="desc.title"/>]-->
-</refnamediv>
-
-<refsynopsisdiv id="synopsis">
-<title id="synopsis.title">Synopsis</title>
-
-<synopsis>
-
-
-
-            <link linkend="ModestTnyFolderTreeView">ModestTnyFolderTreeView</link>;
-<link linkend="GtkWidget">GtkWidget</link>*  <link linkend="modest-tny-folder-tree-view-new">modest_tny_folder_tree_view_new</link> (<link linkend="TnyAccountStoreIface">TnyAccountStoreIface</link> *iface);
-
-</synopsis>
-</refsynopsisdiv>
-
-
-
-
-
-
-
-
-
-<refsect1 id="desc">
-<title id="desc.title">Description</title>
-<para>
-
-</para>
-</refsect1>
-
-<refsect1 id="details">
-<title id="details.title">Details</title>
-<refsect2>
-<title><anchor id="ModestTnyFolderTreeView" role="struct"/>ModestTnyFolderTreeView</title>
-<indexterm><primary>ModestTnyFolderTreeView</primary></indexterm><programlisting>typedef struct {
-        GtkTreeView parent;
-       /* insert public members, if any */
-} ModestTnyFolderTreeView;
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="modest-tny-folder-tree-view-new" role="function"/>modest_tny_folder_tree_view_new ()</title>
-<indexterm><primary>modest_tny_folder_tree_view_new</primary></indexterm><programlisting><link linkend="GtkWidget">GtkWidget</link>*  modest_tny_folder_tree_view_new (<link linkend="TnyAccountStoreIface">TnyAccountStoreIface</link> *iface);</programlisting>
-<para>
-create a new ModestTnyFolderTreeView instance, based on an account store</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>iface</parameter>&nbsp;:</term>
-<listitem><simpara> a TnyAccountStoreIface object
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> a new GtkWidget (a GtkTreeView-subclass)
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-
-</refsect1>
-
-
-
-
-</refentry>
diff --git a/experimental/modest/docs/reference/xml/modest-ui.xml b/experimental/modest/docs/reference/xml/modest-ui.xml
deleted file mode 100644 (file)
index 3cd1d35..0000000
+++ /dev/null
@@ -1,135 +0,0 @@
-<refentry id="modest-ModestUI">
-<refmeta>
-<refentrytitle id="top_of_page">ModestUI</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>MODEST Library</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-<refname>ModestUI</refname>
-<refpurpose></refpurpose>
-<!--[<xref linkend="desc" endterm="desc.title"/>]-->
-</refnamediv>
-
-<refsynopsisdiv id="synopsis">
-<title id="synopsis.title">Synopsis</title>
-
-<synopsis>
-
-
-
-            <link linkend="ModestUI">ModestUI</link>;
-<link linkend="GObject">GObject</link>*    <link linkend="modest-ui-new">modest_ui_new</link>                   (<link linkend="ModestConf">ModestConf</link> *modest_conf);
-<link linkend="gboolean">gboolean</link>    <link linkend="modest-ui-show-main-window">modest_ui_show_main_window</link>      (<link linkend="ModestUI">ModestUI</link> *ui);
-<link linkend="gboolean">gboolean</link>    <link linkend="modest-ui-show-edit-window">modest_ui_show_edit_window</link>      (<link linkend="ModestUI">ModestUI</link> *ui,
-                                             const <link linkend="gchar">gchar</link> *to,
-                                             const <link linkend="gchar">gchar</link> *cc,
-                                             const <link linkend="gchar">gchar</link> *bcc,
-                                             const <link linkend="gchar">gchar</link> *subject,
-                                             const <link linkend="gchar">gchar</link> *body,
-                                             const <link linkend="GSList">GSList</link> *att);
-
-</synopsis>
-</refsynopsisdiv>
-
-
-
-
-
-
-
-
-
-<refsect1 id="desc">
-<title id="desc.title">Description</title>
-<para>
-
-</para>
-</refsect1>
-
-<refsect1 id="details">
-<title id="details.title">Details</title>
-<refsect2>
-<title><anchor id="ModestUI" role="struct"/>ModestUI</title>
-<indexterm><primary>ModestUI</primary></indexterm><programlisting>typedef struct {
-        GObject parent;
-       /* insert public members, if any */
-} ModestUI;
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="modest-ui-new" role="function"/>modest_ui_new ()</title>
-<indexterm><primary>modest_ui_new</primary></indexterm><programlisting><link linkend="GObject">GObject</link>*    modest_ui_new                   (<link linkend="ModestConf">ModestConf</link> *modest_conf);</programlisting>
-<para>
-</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>modest_conf</parameter>&nbsp;:</term>
-<listitem><simpara> a ModestConf instance 
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> a new ModestUI, or NULL in case of error
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="modest-ui-show-main-window" role="function"/>modest_ui_show_main_window ()</title>
-<indexterm><primary>modest_ui_show_main_window</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>    modest_ui_show_main_window      (<link linkend="ModestUI">ModestUI</link> *ui);</programlisting>
-<para>
-</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>ui</parameter>&nbsp;:</term>
-<listitem><simpara> a ModestUI instance 
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> TRUE if succeeded, FALSE otherwise
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="modest-ui-show-edit-window" role="function"/>modest_ui_show_edit_window ()</title>
-<indexterm><primary>modest_ui_show_edit_window</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>    modest_ui_show_edit_window      (<link linkend="ModestUI">ModestUI</link> *ui,
-                                             const <link linkend="gchar">gchar</link> *to,
-                                             const <link linkend="gchar">gchar</link> *cc,
-                                             const <link linkend="gchar">gchar</link> *bcc,
-                                             const <link linkend="gchar">gchar</link> *subject,
-                                             const <link linkend="gchar">gchar</link> *body,
-                                             const <link linkend="GSList">GSList</link> *att);</programlisting>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>ui</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>to</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>cc</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>bcc</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>subject</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>body</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>att</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara>
-
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-
-</refsect1>
-
-
-
-
-</refentry>
diff --git a/experimental/modest/docs/reference/xml/modest-window-mgr.xml b/experimental/modest/docs/reference/xml/modest-window-mgr.xml
deleted file mode 100644 (file)
index a576260..0000000
+++ /dev/null
@@ -1,180 +0,0 @@
-<refentry id="modest-ModestWindowMgr">
-<refmeta>
-<refentrytitle id="top_of_page">ModestWindowMgr</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>MODEST Library</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-<refname>ModestWindowMgr</refname>
-<refpurpose></refpurpose>
-<!--[<xref linkend="desc" endterm="desc.title"/>]-->
-</refnamediv>
-
-<refsynopsisdiv id="synopsis">
-<title id="synopsis.title">Synopsis</title>
-
-<synopsis>
-
-
-
-typedef     <link linkend="ModestWindowType">ModestWindowType</link>;
-            <link linkend="ModestOpenWindow">ModestOpenWindow</link>;
-            <link linkend="ModestWindowMgr">ModestWindowMgr</link>;
-<link linkend="GObject">GObject</link>*    <link linkend="modest-window-mgr-new">modest_window_mgr_new</link>           (void);
-<link linkend="gboolean">gboolean</link>    <link linkend="modest-window-mgr-register">modest_window_mgr_register</link>      (<link linkend="ModestWindowMgr">ModestWindowMgr</link> *self,
-                                             <link linkend="GObject">GObject</link> *win,
-                                             <link linkend="ModestWindowType">ModestWindowType</link> type,
-                                             <link linkend="guint">guint</link> window_id);
-<link linkend="gboolean">gboolean</link>    <link linkend="modest-window-mgr-unregister">modest_window_mgr_unregister</link>    (<link linkend="ModestWindowMgr">ModestWindowMgr</link> *self,
-                                             <link linkend="GObject">GObject</link> *win);
-<link linkend="GObject">GObject</link>*    <link linkend="modest-window-mgr-find-by-type">modest_window_mgr_find_by_type</link>  (<link linkend="ModestWindowMgr">ModestWindowMgr</link> *self,
-                                             <link linkend="ModestWindowType">ModestWindowType</link> type);
-<link linkend="GObject">GObject</link>*    <link linkend="modest-window-mgr-find-by-id">modest_window_mgr_find_by_id</link>    (<link linkend="ModestWindowMgr">ModestWindowMgr</link> *self,
-                                             <link linkend="gint">gint</link> window_id);
-
-</synopsis>
-</refsynopsisdiv>
-
-
-
-
-
-
-
-
-
-<refsect1 id="desc">
-<title id="desc.title">Description</title>
-<para>
-
-</para>
-</refsect1>
-
-<refsect1 id="details">
-<title id="details.title">Details</title>
-<refsect2>
-<title><anchor id="ModestWindowType" role="typedef"/>ModestWindowType</title>
-<indexterm><primary>ModestWindowType</primary></indexterm><programlisting>typedef guint ModestWindowType;
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="ModestOpenWindow" role="struct"/>ModestOpenWindow</title>
-<indexterm><primary>ModestOpenWindow</primary></indexterm><programlisting>typedef struct {
-       GObject          *win;
-       ModestWindowType type;
-       guint            id;
-} ModestOpenWindow;
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="ModestWindowMgr" role="struct"/>ModestWindowMgr</title>
-<indexterm><primary>ModestWindowMgr</primary></indexterm><programlisting>typedef struct {
-       GObject parent;
-} ModestWindowMgr;
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="modest-window-mgr-new" role="function"/>modest_window_mgr_new ()</title>
-<indexterm><primary>modest_window_mgr_new</primary></indexterm><programlisting><link linkend="GObject">GObject</link>*    modest_window_mgr_new           (void);</programlisting>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara>
-
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="modest-window-mgr-register" role="function"/>modest_window_mgr_register ()</title>
-<indexterm><primary>modest_window_mgr_register</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>    modest_window_mgr_register      (<link linkend="ModestWindowMgr">ModestWindowMgr</link> *self,
-                                             <link linkend="GObject">GObject</link> *win,
-                                             <link linkend="ModestWindowType">ModestWindowType</link> type,
-                                             <link linkend="guint">guint</link> window_id);</programlisting>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>self</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>win</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>window_id</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara>
-
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="modest-window-mgr-unregister" role="function"/>modest_window_mgr_unregister ()</title>
-<indexterm><primary>modest_window_mgr_unregister</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>    modest_window_mgr_unregister    (<link linkend="ModestWindowMgr">ModestWindowMgr</link> *self,
-                                             <link linkend="GObject">GObject</link> *win);</programlisting>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>self</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>win</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara>
-
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="modest-window-mgr-find-by-type" role="function"/>modest_window_mgr_find_by_type ()</title>
-<indexterm><primary>modest_window_mgr_find_by_type</primary></indexterm><programlisting><link linkend="GObject">GObject</link>*    modest_window_mgr_find_by_type  (<link linkend="ModestWindowMgr">ModestWindowMgr</link> *self,
-                                             <link linkend="ModestWindowType">ModestWindowType</link> type);</programlisting>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>self</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara>
-
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="modest-window-mgr-find-by-id" role="function"/>modest_window_mgr_find_by_id ()</title>
-<indexterm><primary>modest_window_mgr_find_by_id</primary></indexterm><programlisting><link linkend="GObject">GObject</link>*    modest_window_mgr_find_by_id    (<link linkend="ModestWindowMgr">ModestWindowMgr</link> *self,
-                                             <link linkend="gint">gint</link> window_id);</programlisting>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>self</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>window_id</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara>
-
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-
-</refsect1>
-
-
-
-
-</refentry>
diff --git a/experimental/modest/ltmain.sh b/experimental/modest/ltmain.sh
deleted file mode 100644 (file)
index 8fc56db..0000000
+++ /dev/null
@@ -1,6871 +0,0 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-basename="s,^.*/,,g"
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
-
-# The name of this program:
-progname=`echo "$progpath" | $SED $basename`
-modename="$progname"
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION="1.5.22 Debian 1.5.22-2"
-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
-  setopt NO_GLOB_SUBST
-fi
-
-# Check that we have a working $echo.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell, and then maybe $echo will work.
-  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit $EXIT_SUCCESS
-fi
-
-default_mode=
-help="Try \`$progname --help' for more information."
-magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
-mv="mv -f"
-rm="rm -f"
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  SP2NL='tr \040 \012'
-  NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  SP2NL='tr \100 \n'
-  NL2SP='tr \r\n \100\100'
-  ;;
-esac
-
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-# We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
-fi
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS="  $lt_nl"
-
-if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-  $echo "$modename: not configured to build any kind of library" 1>&2
-  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit $EXIT_FAILURE
-fi
-
-# Global variables.
-mode=$default_mode
-nonopt=
-prev=
-prevopt=
-run=
-show="$echo"
-show_help=
-execute_dlfiles=
-duplicate_deps=no
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-
-#####################################
-# Shell function definitions:
-# This seems to be the best place for them
-
-# func_mktempdir [string]
-# Make a temporary directory that won't clash with other running
-# libtool processes, and avoids race conditions if possible.  If
-# given, STRING is the basename for that directory.
-func_mktempdir ()
-{
-    my_template="${TMPDIR-/tmp}/${1-$progname}"
-
-    if test "$run" = ":"; then
-      # Return a directory name, but don't create it in dry-run mode
-      my_tmpdir="${my_template}-$$"
-    else
-
-      # If mktemp works, use that first and foremost
-      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
-
-      if test ! -d "$my_tmpdir"; then
-       # Failing that, at least try and use $RANDOM to avoid a race
-       my_tmpdir="${my_template}-${RANDOM-0}$$"
-
-       save_mktempdir_umask=`umask`
-       umask 0077
-       $mkdir "$my_tmpdir"
-       umask $save_mktempdir_umask
-      fi
-
-      # If we're not in dry-run mode, bomb out on failure
-      test -d "$my_tmpdir" || {
-        $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
-       exit $EXIT_FAILURE
-      }
-    fi
-
-    $echo "X$my_tmpdir" | $Xsed
-}
-
-
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-func_win32_libid ()
-{
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
-      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-      win32_nmres=`eval $NM -f posix -A $1 | \
-       $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
-      case $win32_nmres in
-      import*)  win32_libid_type="x86 archive import";;
-      *)        win32_libid_type="x86 archive static";;
-      esac
-    fi
-    ;;
-  *DLL*)
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
-    esac
-    ;;
-  esac
-  $echo $win32_libid_type
-}
-
-
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
-{
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-       case $arg in
-         *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
-         arg="\"$arg\""
-         ;;
-       esac
-       CC_quoted="$CC_quoted $arg"
-      done
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-       for z in $available_tags; do
-         if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-           # Evaluate the configuration.
-           eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-           CC_quoted=
-           for arg in $CC; do
-           # Double-quote args containing other shell metacharacters.
-           case $arg in
-             *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \     ]*|*]*|"")
-             arg="\"$arg\""
-             ;;
-           esac
-           CC_quoted="$CC_quoted $arg"
-         done
-           case "$@ " in
-             " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
-             # The compiler in the base compile command matches
-             # the one in the tagged configuration.
-             # Assume this is the tagged configuration we want.
-             tagname=$z
-             break
-             ;;
-           esac
-         fi
-       done
-       # If $tagname still isn't set, then no tagged configuration
-       # was found and let the user know that the "--tag" command
-       # line option must be used.
-       if test -z "$tagname"; then
-         $echo "$modename: unable to infer tagged configuration"
-         $echo "$modename: specify a tag with \`--tag'" 1>&2
-         exit $EXIT_FAILURE
-#        else
-#          $echo "$modename: using $tagname tagged configuration"
-       fi
-       ;;
-      esac
-    fi
-}
-
-
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
-{
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
-
-    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
-    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-     :
-    else
-      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
-      exit $EXIT_FAILURE
-    fi
-}
-
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
-{
-    my_gentop="$1"; shift
-    my_oldlibs=${1+"$@"}
-    my_oldobjs=""
-    my_xlib=""
-    my_xabs=""
-    my_xdir=""
-    my_status=""
-
-    $show "${rm}r $my_gentop"
-    $run ${rm}r "$my_gentop"
-    $show "$mkdir $my_gentop"
-    $run $mkdir "$my_gentop"
-    my_status=$?
-    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
-      exit $my_status
-    fi
-
-    for my_xlib in $my_oldlibs; do
-      # Extract the objects.
-      case $my_xlib in
-       [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-       *) my_xabs=`pwd`"/$my_xlib" ;;
-      esac
-      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xdir="$my_gentop/$my_xlib"
-
-      $show "${rm}r $my_xdir"
-      $run ${rm}r "$my_xdir"
-      $show "$mkdir $my_xdir"
-      $run $mkdir "$my_xdir"
-      exit_status=$?
-      if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
-       exit $exit_status
-      fi
-      case $host in
-      *-darwin*)
-       $show "Extracting $my_xabs"
-       # Do not bother doing anything if just a dry run
-       if test -z "$run"; then
-         darwin_orig_dir=`pwd`
-         cd $my_xdir || exit $?
-         darwin_archive=$my_xabs
-         darwin_curdir=`pwd`
-         darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
-         darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
-         if test -n "$darwin_arches"; then 
-           darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
-           darwin_arch=
-           $show "$darwin_base_archive has multiple architectures $darwin_arches"
-           for darwin_arch in  $darwin_arches ; do
-             mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-             lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-             cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-             func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-             cd "$darwin_curdir"
-             $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-           done # $darwin_arches
-      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
-           darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
-           darwin_file=
-           darwin_files=
-           for darwin_file in $darwin_filelist; do
-             darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-             lipo -create -output "$darwin_file" $darwin_files
-           done # $darwin_filelist
-           ${rm}r unfat-$$
-           cd "$darwin_orig_dir"
-         else
-           cd "$darwin_orig_dir"
-           func_extract_an_archive "$my_xdir" "$my_xabs"
-         fi # $darwin_arches
-       fi # $run
-       ;;
-      *)
-        func_extract_an_archive "$my_xdir" "$my_xabs"
-        ;;
-      esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-    done
-    func_extract_archives_result="$my_oldobjs"
-}
-# End of Shell function definitions
-#####################################
-
-# Darwin sucks
-eval std_shrext=\"$shrext_cmds\"
-
-disable_libs=no
-
-# Parse our command line options once, thoroughly.
-while test "$#" -gt 0
-do
-  arg="$1"
-  shift
-
-  case $arg in
-  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$prev"; then
-    case $prev in
-    execute_dlfiles)
-      execute_dlfiles="$execute_dlfiles $arg"
-      ;;
-    tag)
-      tagname="$arg"
-      preserve_args="${preserve_args}=$arg"
-
-      # Check whether tagname contains only valid characters
-      case $tagname in
-      *[!-_A-Za-z0-9,/]*)
-       $echo "$progname: invalid tag name: $tagname" 1>&2
-       exit $EXIT_FAILURE
-       ;;
-      esac
-
-      case $tagname in
-      CC)
-       # Don't test for the "default" C tag, as we know, it's there, but
-       # not specially marked.
-       ;;
-      *)
-       if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
-         taglist="$taglist $tagname"
-         # Evaluate the configuration.
-         eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
-       else
-         $echo "$progname: ignoring unknown tag $tagname" 1>&2
-       fi
-       ;;
-      esac
-      ;;
-    *)
-      eval "$prev=\$arg"
-      ;;
-    esac
-
-    prev=
-    prevopt=
-    continue
-  fi
-
-  # Have we seen a non-optional argument yet?
-  case $arg in
-  --help)
-    show_help=yes
-    ;;
-
-  --version)
-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-    $echo
-    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
-    $echo "This is free software; see the source for copying conditions.  There is NO"
-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-    exit $?
-    ;;
-
-  --config)
-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
-    done
-    exit $?
-    ;;
-
-  --debug)
-    $echo "$progname: enabling shell trace mode"
-    set -x
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --dry-run | -n)
-    run=:
-    ;;
-
-  --features)
-    $echo "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      $echo "enable shared libraries"
-    else
-      $echo "disable shared libraries"
-    fi
-    if test "$build_old_libs" = yes; then
-      $echo "enable static libraries"
-    else
-      $echo "disable static libraries"
-    fi
-    exit $?
-    ;;
-
-  --finish) mode="finish" ;;
-
-  --mode) prevopt="--mode" prev=mode ;;
-  --mode=*) mode="$optarg" ;;
-
-  --preserve-dup-deps) duplicate_deps="yes" ;;
-
-  --quiet | --silent)
-    show=:
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --tag)
-    prevopt="--tag"
-    prev=tag
-    preserve_args="$preserve_args --tag"
-    ;;
-  --tag=*)
-    set tag "$optarg" ${1+"$@"}
-    shift
-    prev=tag
-    preserve_args="$preserve_args --tag"
-    ;;
-
-  -dlopen)
-    prevopt="-dlopen"
-    prev=execute_dlfiles
-    ;;
-
-  -*)
-    $echo "$modename: unrecognized option \`$arg'" 1>&2
-    $echo "$help" 1>&2
-    exit $EXIT_FAILURE
-    ;;
-
-  *)
-    nonopt="$arg"
-    break
-    ;;
-  esac
-done
-
-if test -n "$prevopt"; then
-  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-fi
-
-case $disable_libs in
-no) 
-  ;;
-shared)
-  build_libtool_libs=no
-  build_old_libs=yes
-  ;;
-static)
-  build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-  ;;
-esac
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-if test -z "$show_help"; then
-
-  # Infer the operation mode.
-  if test -z "$mode"; then
-    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
-    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
-    case $nonopt in
-    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
-      mode=link
-      for arg
-      do
-       case $arg in
-       -c)
-          mode=compile
-          break
-          ;;
-       esac
-      done
-      ;;
-    *db | *dbx | *strace | *truss)
-      mode=execute
-      ;;
-    *install*|cp|mv)
-      mode=install
-      ;;
-    *rm)
-      mode=uninstall
-      ;;
-    *)
-      # If we have no mode, but dlfiles were specified, then do execute mode.
-      test -n "$execute_dlfiles" && mode=execute
-
-      # Just use the default operation mode.
-      if test -z "$mode"; then
-       if test -n "$nonopt"; then
-         $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
-       else
-         $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
-       fi
-      fi
-      ;;
-    esac
-  fi
-
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-    $echo "$help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$modename --help --mode=$mode' for more information."
-
-  # These modes are in order of execution frequency so that they run quickly.
-  case $mode in
-  # libtool compile mode
-  compile)
-    modename="$modename: compile"
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-    suppress_opt=yes
-    suppress_output=
-    arg_mode=normal
-    libobj=
-    later=
-
-    for arg
-    do
-      case $arg_mode in
-      arg  )
-       # do not "continue".  Instead, add this to base_compile
-       lastarg="$arg"
-       arg_mode=normal
-       ;;
-
-      target )
-       libobj="$arg"
-       arg_mode=normal
-       continue
-       ;;
-
-      normal )
-       # Accept any command-line options.
-       case $arg in
-       -o)
-         if test -n "$libobj" ; then
-           $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-           exit $EXIT_FAILURE
-         fi
-         arg_mode=target
-         continue
-         ;;
-
-       -static | -prefer-pic | -prefer-non-pic)
-         later="$later $arg"
-         continue
-         ;;
-
-       -no-suppress)
-         suppress_opt=no
-         continue
-         ;;
-
-       -Xcompiler)
-         arg_mode=arg  #  the next one goes into the "base_compile" arg list
-         continue      #  The current "srcfile" will either be retained or
-         ;;            #  replaced later.  I would guess that would be a bug.
-
-       -Wc,*)
-         args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
-         lastarg=
-         save_ifs="$IFS"; IFS=','
-         for arg in $args; do
-           IFS="$save_ifs"
-
-           # Double-quote args containing other shell metacharacters.
-           # Many Bourne shells cannot handle close brackets correctly
-           # in scan sets, so we specify it separately.
-           case $arg in
-             *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \     ]*|*]*|"")
-             arg="\"$arg\""
-             ;;
-           esac
-           lastarg="$lastarg $arg"
-         done
-         IFS="$save_ifs"
-         lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
-
-         # Add the arguments to base_compile.
-         base_compile="$base_compile $lastarg"
-         continue
-         ;;
-
-       * )
-         # Accept the current argument as the source file.
-         # The previous "srcfile" becomes the current argument.
-         #
-         lastarg="$srcfile"
-         srcfile="$arg"
-         ;;
-       esac  #  case $arg
-       ;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-
-      case $lastarg in
-      # Double-quote args containing other shell metacharacters.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, and some SunOS ksh mistreat backslash-escaping
-      # in scan sets (worked around with variable expansion),
-      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
-      # at all, so we specify them separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \    ]*|*]*|"")
-       lastarg="\"$lastarg\""
-       ;;
-      esac
-
-      base_compile="$base_compile $lastarg"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      $echo "$modename: you must specify an argument for -Xcompile"
-      exit $EXIT_FAILURE
-      ;;
-    target)
-      $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    *)
-      # Get the name of the library object.
-      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    xform='[cCFSifmso]'
-    case $libobj in
-    *.ada) xform=ada ;;
-    *.adb) xform=adb ;;
-    *.ads) xform=ads ;;
-    *.asm) xform=asm ;;
-    *.c++) xform=c++ ;;
-    *.cc) xform=cc ;;
-    *.ii) xform=ii ;;
-    *.class) xform=class ;;
-    *.cpp) xform=cpp ;;
-    *.cxx) xform=cxx ;;
-    *.f90) xform=f90 ;;
-    *.for) xform=for ;;
-    *.java) xform=java ;;
-    esac
-
-    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-
-    case $libobj in
-    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
-    *)
-      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    esac
-
-    func_infer_tag $base_compile
-
-    for arg in $later; do
-      case $arg in
-      -static)
-       build_old_libs=yes
-       continue
-       ;;
-
-      -prefer-pic)
-       pic_mode=yes
-       continue
-       ;;
-
-      -prefer-non-pic)
-       pic_mode=no
-       continue
-       ;;
-      esac
-    done
-
-    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
-    case $qlibobj in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \    ]*|*]*|"")
-       qlibobj="\"$qlibobj\"" ;;
-    esac
-    test "X$libobj" != "X$qlibobj" \
-       && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"'  &()|`$[]' \
-       && $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
-    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$xdir" = "X$obj"; then
-      xdir=
-    else
-      xdir=$xdir/
-    fi
-    lobj=${xdir}$objdir/$objname
-
-    if test -z "$base_compile"; then
-      $echo "$modename: you must specify a compilation command" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    $run $rm $removelist
-    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2*)
-      pic_mode=default
-      ;;
-    esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # Calculate the filename of the output object if compiler does
-    # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
-      removelist="$removelist $output_obj $lockfile"
-      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
-      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
-       $show "Waiting for $lockfile to be removed"
-       sleep 2
-      done
-    elif test "$need_locks" = warn; then
-      if test -f "$lockfile"; then
-       $echo "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-       $run $rm $removelist
-       exit $EXIT_FAILURE
-      fi
-      $echo "$srcfile" > "$lockfile"
-    fi
-
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
-    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
-    case $qsrcfile in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \    ]*|*]*|"")
-      qsrcfile="\"$qsrcfile\"" ;;
-    esac
-
-    $run $rm "$libobj" "${libobj}T"
-
-    # Create a libtool object file (analogous to a ".la" file),
-    # but don't create it if we're doing a dry run.
-    test -z "$run" && cat > ${libobj}T <<EOF
-# $libobj - a libtool object file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-EOF
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test "$pic_mode" != no; then
-       command="$base_compile $qsrcfile $pic_flag"
-      else
-       # Don't build PIC code
-       command="$base_compile $qsrcfile"
-      fi
-
-      if test ! -d "${xdir}$objdir"; then
-       $show "$mkdir ${xdir}$objdir"
-       $run $mkdir ${xdir}$objdir
-       exit_status=$?
-       if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
-         exit $exit_status
-       fi
-      fi
-
-      if test -z "$output_obj"; then
-       # Place PIC objects in $objdir
-       command="$command -o $lobj"
-      fi
-
-      $run $rm "$lobj" "$output_obj"
-
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-       test -n "$output_obj" && $run $rm $removelist
-       exit $EXIT_FAILURE
-      fi
-
-      if test "$need_locks" = warn &&
-        test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-       $echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-       $run $rm $removelist
-       exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-       $show "$mv $output_obj $lobj"
-       if $run $mv $output_obj $lobj; then :
-       else
-         error=$?
-         $run $rm $removelist
-         exit $error
-       fi
-      fi
-
-      # Append the name of the PIC object to the libtool object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object='$objdir/$objname'
-
-EOF
-
-      # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
-        suppress_output=' >/dev/null 2>&1'
-      fi
-    else
-      # No PIC object so indicate it doesn't exist in the libtool
-      # object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object=none
-
-EOF
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
-       # Don't build PIC code
-       command="$base_compile $qsrcfile"
-      else
-       command="$base_compile $qsrcfile $pic_flag"
-      fi
-      if test "$compiler_c_o" = yes; then
-       command="$command -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
-      $run $rm "$obj" "$output_obj"
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-       $run $rm $removelist
-       exit $EXIT_FAILURE
-      fi
-
-      if test "$need_locks" = warn &&
-        test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-       $echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-       $run $rm $removelist
-       exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed
-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-       $show "$mv $output_obj $obj"
-       if $run $mv $output_obj $obj; then :
-       else
-         error=$?
-         $run $rm $removelist
-         exit $error
-       fi
-      fi
-
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object='$objname'
-
-EOF
-    else
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object=none
-
-EOF
-    fi
-
-    $run $mv "${libobj}T" "${libobj}"
-
-    # Unlock the critical section if it was locked
-    if test "$need_locks" != no; then
-      $run $rm "$lockfile"
-    fi
-
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool link mode
-  link | relink)
-    modename="$modename: link"
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args="$nonopt"
-    base_compile="$nonopt $@"
-    compile_command="$nonopt"
-    finalize_command="$nonopt"
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-
-    avoid_version=no
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    notinst_path= # paths that contain not-installed libtool libraries
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-
-    func_infer_tag $base_compile
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -all-static | -static)
-       if test "X$arg" = "X-all-static"; then
-         if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-           $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
-         fi
-         if test -n "$link_static_flag"; then
-           dlopen_self=$dlopen_self_static
-         fi
-         prefer_static_libs=yes
-       else
-         if test -z "$pic_flag" && test -n "$link_static_flag"; then
-           dlopen_self=$dlopen_self_static
-         fi
-         prefer_static_libs=built
-       fi
-       build_libtool_libs=no
-       build_old_libs=yes
-       break
-       ;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg="$1"
-      shift
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \    ]*|*]*|"")
-       qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
-       ;;
-      *) qarg=$arg ;;
-      esac
-      libtool_args="$libtool_args $qarg"
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-       case $prev in
-       output)
-         compile_command="$compile_command @OUTPUT@"
-         finalize_command="$finalize_command @OUTPUT@"
-         ;;
-       esac
-
-       case $prev in
-       dlfiles|dlprefiles)
-         if test "$preload" = no; then
-           # Add the symbol object into the linking commands.
-           compile_command="$compile_command @SYMFILE@"
-           finalize_command="$finalize_command @SYMFILE@"
-           preload=yes
-         fi
-         case $arg in
-         *.la | *.lo) ;;  # We handle these cases below.
-         force)
-           if test "$dlself" = no; then
-             dlself=needless
-             export_dynamic=yes
-           fi
-           prev=
-           continue
-           ;;
-         self)
-           if test "$prev" = dlprefiles; then
-             dlself=yes
-           elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-             dlself=yes
-           else
-             dlself=needless
-             export_dynamic=yes
-           fi
-           prev=
-           continue
-           ;;
-         *)
-           if test "$prev" = dlfiles; then
-             dlfiles="$dlfiles $arg"
-           else
-             dlprefiles="$dlprefiles $arg"
-           fi
-           prev=
-           continue
-           ;;
-         esac
-         ;;
-       expsyms)
-         export_symbols="$arg"
-         if test ! -f "$arg"; then
-           $echo "$modename: symbol file \`$arg' does not exist"
-           exit $EXIT_FAILURE
-         fi
-         prev=
-         continue
-         ;;
-       expsyms_regex)
-         export_symbols_regex="$arg"
-         prev=
-         continue
-         ;;
-       inst_prefix)
-         inst_prefix_dir="$arg"
-         prev=
-         continue
-         ;;
-       precious_regex)
-         precious_files_regex="$arg"
-         prev=
-         continue
-         ;;
-       release)
-         release="-$arg"
-         prev=
-         continue
-         ;;
-       objectlist)
-         if test -f "$arg"; then
-           save_arg=$arg
-           moreargs=
-           for fil in `cat $save_arg`
-           do
-#            moreargs="$moreargs $fil"
-             arg=$fil
-             # A libtool-controlled object.
-
-             # Check to see that this really is a libtool object.
-             if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-               pic_object=
-               non_pic_object=
-
-               # Read the .lo file
-               # If there is no directory component, then add one.
-               case $arg in
-               */* | *\\*) . $arg ;;
-               *) . ./$arg ;;
-               esac
-
-               if test -z "$pic_object" || \
-                  test -z "$non_pic_object" ||
-                  test "$pic_object" = none && \
-                  test "$non_pic_object" = none; then
-                 $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-                 exit $EXIT_FAILURE
-               fi
-
-               # Extract subdirectory from the argument.
-               xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-               if test "X$xdir" = "X$arg"; then
-                 xdir=
-               else
-                 xdir="$xdir/"
-               fi
-
-               if test "$pic_object" != none; then
-                 # Prepend the subdirectory the object is found in.
-                 pic_object="$xdir$pic_object"
-
-                 if test "$prev" = dlfiles; then
-                   if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-                     dlfiles="$dlfiles $pic_object"
-                     prev=
-                     continue
-                   else
-                     # If libtool objects are unsupported, then we need to preload.
-                     prev=dlprefiles
-                   fi
-                 fi
-
-                 # CHECK ME:  I think I busted this.  -Ossama
-                 if test "$prev" = dlprefiles; then
-                   # Preload the old-style object.
-                   dlprefiles="$dlprefiles $pic_object"
-                   prev=
-                 fi
-
-                 # A PIC object.
-                 libobjs="$libobjs $pic_object"
-                 arg="$pic_object"
-               fi
-
-               # Non-PIC object.
-               if test "$non_pic_object" != none; then
-                 # Prepend the subdirectory the object is found in.
-                 non_pic_object="$xdir$non_pic_object"
-
-                 # A standard non-PIC object
-                 non_pic_objects="$non_pic_objects $non_pic_object"
-                 if test -z "$pic_object" || test "$pic_object" = none ; then
-                   arg="$non_pic_object"
-                 fi
-               else
-                 # If the PIC object exists, use it instead.
-                 # $xdir was prepended to $pic_object above.
-                 non_pic_object="$pic_object"
-                 non_pic_objects="$non_pic_objects $non_pic_object"
-               fi
-             else
-               # Only an error if not doing a dry-run.
-               if test -z "$run"; then
-                 $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-                 exit $EXIT_FAILURE
-               else
-                 # Dry-run case.
-
-                 # Extract subdirectory from the argument.
-                 xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-                 if test "X$xdir" = "X$arg"; then
-                   xdir=
-                 else
-                   xdir="$xdir/"
-                 fi
-
-                 pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-                 non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-                 libobjs="$libobjs $pic_object"
-                 non_pic_objects="$non_pic_objects $non_pic_object"
-               fi
-             fi
-           done
-         else
-           $echo "$modename: link input file \`$save_arg' does not exist"
-           exit $EXIT_FAILURE
-         fi
-         arg=$save_arg
-         prev=
-         continue
-         ;;
-       rpath | xrpath)
-         # We need an absolute path.
-         case $arg in
-         [\\/]* | [A-Za-z]:[\\/]*) ;;
-         *)
-           $echo "$modename: only absolute run-paths are allowed" 1>&2
-           exit $EXIT_FAILURE
-           ;;
-         esac
-         if test "$prev" = rpath; then
-           case "$rpath " in
-           *" $arg "*) ;;
-           *) rpath="$rpath $arg" ;;
-           esac
-         else
-           case "$xrpath " in
-           *" $arg "*) ;;
-           *) xrpath="$xrpath $arg" ;;
-           esac
-         fi
-         prev=
-         continue
-         ;;
-       xcompiler)
-         compiler_flags="$compiler_flags $qarg"
-         prev=
-         compile_command="$compile_command $qarg"
-         finalize_command="$finalize_command $qarg"
-         continue
-         ;;
-       xlinker)
-         linker_flags="$linker_flags $qarg"
-         compiler_flags="$compiler_flags $wl$qarg"
-         prev=
-         compile_command="$compile_command $wl$qarg"
-         finalize_command="$finalize_command $wl$qarg"
-         continue
-         ;;
-       xcclinker)
-         linker_flags="$linker_flags $qarg"
-         compiler_flags="$compiler_flags $qarg"
-         prev=
-         compile_command="$compile_command $qarg"
-         finalize_command="$finalize_command $qarg"
-         continue
-         ;;
-       shrext)
-         shrext_cmds="$arg"
-         prev=
-         continue
-         ;;
-       darwin_framework|darwin_framework_skip)
-         test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
-         compile_command="$compile_command $arg"
-         finalize_command="$finalize_command $arg"
-         prev=
-         continue
-         ;;
-       *)
-         eval "$prev=\"\$arg\""
-         prev=
-         continue
-         ;;
-       esac
-      fi # test -n "$prev"
-
-      prevarg="$arg"
-
-      case $arg in
-      -all-static)
-       if test -n "$link_static_flag"; then
-         compile_command="$compile_command $link_static_flag"
-         finalize_command="$finalize_command $link_static_flag"
-       fi
-       continue
-       ;;
-
-      -allow-undefined)
-       # FIXME: remove this flag sometime in the future.
-       $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
-       continue
-       ;;
-
-      -avoid-version)
-       avoid_version=yes
-       continue
-       ;;
-
-      -dlopen)
-       prev=dlfiles
-       continue
-       ;;
-
-      -dlpreopen)
-       prev=dlprefiles
-       continue
-       ;;
-
-      -export-dynamic)
-       export_dynamic=yes
-       continue
-       ;;
-
-      -export-symbols | -export-symbols-regex)
-       if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-         $echo "$modename: more than one -exported-symbols argument is not allowed"
-         exit $EXIT_FAILURE
-       fi
-       if test "X$arg" = "X-export-symbols"; then
-         prev=expsyms
-       else
-         prev=expsyms_regex
-       fi
-       continue
-       ;;
-
-      -framework|-arch|-isysroot)
-       case " $CC " in
-         *" ${arg} ${1} "* | *" ${arg} ${1} "*) 
-               prev=darwin_framework_skip ;;
-         *) compiler_flags="$compiler_flags $arg"
-            prev=darwin_framework ;;
-       esac
-       compile_command="$compile_command $arg"
-       finalize_command="$finalize_command $arg"
-       continue
-       ;;
-
-      -inst-prefix-dir)
-       prev=inst_prefix
-       continue
-       ;;
-
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-       case $with_gcc/$host in
-       no/*-*-irix* | /*-*-irix*)
-         compile_command="$compile_command $arg"
-         finalize_command="$finalize_command $arg"
-         ;;
-       esac
-       continue
-       ;;
-
-      -L*)
-       dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
-       # We need an absolute path.
-       case $dir in
-       [\\/]* | [A-Za-z]:[\\/]*) ;;
-       *)
-         absdir=`cd "$dir" && pwd`
-         if test -z "$absdir"; then
-           $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-           absdir="$dir"
-           notinst_path="$notinst_path $dir"
-         fi
-         dir="$absdir"
-         ;;
-       esac
-       case "$deplibs " in
-       *" -L$dir "*) ;;
-       *)
-         deplibs="$deplibs -L$dir"
-         lib_search_path="$lib_search_path $dir"
-         ;;
-       esac
-       case $host in
-       *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-         testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
-         case :$dllsearchpath: in
-         *":$dir:"*) ;;
-         *) dllsearchpath="$dllsearchpath:$dir";;
-         esac
-         case :$dllsearchpath: in
-         *":$testbindir:"*) ;;
-         *) dllsearchpath="$dllsearchpath:$testbindir";;
-         esac
-         ;;
-       esac
-       continue
-       ;;
-
-      -l*)
-       if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-         case $host in
-         *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
-           # These systems don't actually have a C or math library (as such)
-           continue
-           ;;
-         *-*-os2*)
-           # These systems don't actually have a C library (as such)
-           test "X$arg" = "X-lc" && continue
-           ;;
-         *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-           # Do not include libc due to us having libc/libc_r.
-           test "X$arg" = "X-lc" && continue
-           ;;
-         *-*-rhapsody* | *-*-darwin1.[012])
-           # Rhapsody C and math libraries are in the System framework
-           deplibs="$deplibs -framework System"
-           continue
-           ;;
-         *-*-sco3.2v5* | *-*-sco5v6*)
-           # Causes problems with __ctype
-           test "X$arg" = "X-lc" && continue
-           ;;
-         *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-           # Compiler inserts libc in the correct place for threads to work
-           test "X$arg" = "X-lc" && continue
-           ;;
-         esac
-       elif test "X$arg" = "X-lc_r"; then
-        case $host in
-        *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-          # Do not include libc_r directly, use -pthread flag.
-          continue
-          ;;
-        esac
-       fi
-       deplibs="$deplibs $arg"
-       continue
-       ;;
-
-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-      # classes, name mangling, and exception handling.
-      -model)
-       compile_command="$compile_command $arg"
-       compiler_flags="$compiler_flags $arg"
-       finalize_command="$finalize_command $arg"
-       prev=xcompiler
-       continue
-       ;;
-
-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-       compiler_flags="$compiler_flags $arg"
-       compile_command="$compile_command $arg"
-       finalize_command="$finalize_command $arg"
-       continue
-       ;;
-
-      -module)
-       module=yes
-       continue
-       ;;
-
-      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-      # +DA*, +DD* enable 64-bit mode on the HP compiler
-      # -q* pass through compiler args for the IBM compiler
-      # -m* pass through architecture-specific compiler args for GCC
-      # -m*, -t[45]*, -txscale* pass through architecture-specific
-      # compiler args for GCC
-      # -pg pass through profiling flag for GCC
-      # @file GCC response files
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-      -t[45]*|-txscale*|@*)
-
-       # Unknown arguments in both finalize_command and compile_command need
-       # to be aesthetically quoted because they are evaled later.
-       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-       case $arg in
-       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \   ]*|*]*|"")
-         arg="\"$arg\""
-         ;;
-       esac
-        compile_command="$compile_command $arg"
-        finalize_command="$finalize_command $arg"
-        compiler_flags="$compiler_flags $arg"
-        continue
-        ;;
-
-      -shrext)
-       prev=shrext
-       continue
-       ;;
-
-      -no-fast-install)
-       fast_install=no
-       continue
-       ;;
-
-      -no-install)
-       case $host in
-       *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-         # The PATH hackery in wrapper scripts is required on Windows
-         # in order for the loader to find any dlls it needs.
-         $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
-         $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
-         fast_install=no
-         ;;
-       *) no_install=yes ;;
-       esac
-       continue
-       ;;
-
-      -no-undefined)
-       allow_undefined=no
-       continue
-       ;;
-
-      -objectlist)
-       prev=objectlist
-       continue
-       ;;
-
-      -o) prev=output ;;
-
-      -precious-files-regex)
-       prev=precious_regex
-       continue
-       ;;
-
-      -release)
-       prev=release
-       continue
-       ;;
-
-      -rpath)
-       prev=rpath
-       continue
-       ;;
-
-      -R)
-       prev=xrpath
-       continue
-       ;;
-
-      -R*)
-       dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
-       # We need an absolute path.
-       case $dir in
-       [\\/]* | [A-Za-z]:[\\/]*) ;;
-       *)
-         $echo "$modename: only absolute run-paths are allowed" 1>&2
-         exit $EXIT_FAILURE
-         ;;
-       esac
-       case "$xrpath " in
-       *" $dir "*) ;;
-       *) xrpath="$xrpath $dir" ;;
-       esac
-       continue
-       ;;
-
-      -static)
-       # The effects of -static are defined in a previous loop.
-       # We used to do the same as -all-static on platforms that
-       # didn't have a PIC flag, but the assumption that the effects
-       # would be equivalent was wrong.  It would break on at least
-       # Digital Unix and AIX.
-       continue
-       ;;
-
-      -thread-safe)
-       thread_safe=yes
-       continue
-       ;;
-
-      -version-info)
-       prev=vinfo
-       continue
-       ;;
-      -version-number)
-       prev=vinfo
-       vinfo_number=yes
-       continue
-       ;;
-
-      -Wc,*)
-       args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-       arg=
-       save_ifs="$IFS"; IFS=','
-       for flag in $args; do
-         IFS="$save_ifs"
-         case $flag in
-           *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \       ]*|*]*|"")
-           flag="\"$flag\""
-           ;;
-         esac
-         arg="$arg $wl$flag"
-         compiler_flags="$compiler_flags $flag"
-       done
-       IFS="$save_ifs"
-       arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-       ;;
-
-      -Wl,*)
-       args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
-       arg=
-       save_ifs="$IFS"; IFS=','
-       for flag in $args; do
-         IFS="$save_ifs"
-         case $flag in
-           *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \       ]*|*]*|"")
-           flag="\"$flag\""
-           ;;
-         esac
-         arg="$arg $wl$flag"
-         compiler_flags="$compiler_flags $wl$flag"
-         linker_flags="$linker_flags $flag"
-       done
-       IFS="$save_ifs"
-       arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-       ;;
-
-      -Xcompiler)
-       prev=xcompiler
-       continue
-       ;;
-
-      -Xlinker)
-       prev=xlinker
-       continue
-       ;;
-
-      -XCClinker)
-       prev=xcclinker
-       continue
-       ;;
-
-      # Some other compiler flag.
-      -* | +*)
-       # Unknown arguments in both finalize_command and compile_command need
-       # to be aesthetically quoted because they are evaled later.
-       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-       case $arg in
-       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \   ]*|*]*|"")
-         arg="\"$arg\""
-         ;;
-       esac
-       ;;
-
-      *.$objext)
-       # A standard object.
-       objs="$objs $arg"
-       ;;
-
-      *.lo)
-       # A libtool-controlled object.
-
-       # Check to see that this really is a libtool object.
-       if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-         pic_object=
-         non_pic_object=
-
-         # Read the .lo file
-         # If there is no directory component, then add one.
-         case $arg in
-         */* | *\\*) . $arg ;;
-         *) . ./$arg ;;
-         esac
-
-         if test -z "$pic_object" || \
-            test -z "$non_pic_object" ||
-            test "$pic_object" = none && \
-            test "$non_pic_object" = none; then
-           $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-           exit $EXIT_FAILURE
-         fi
-
-         # Extract subdirectory from the argument.
-         xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-         if test "X$xdir" = "X$arg"; then
-           xdir=
-         else
-           xdir="$xdir/"
-         fi
-
-         if test "$pic_object" != none; then
-           # Prepend the subdirectory the object is found in.
-           pic_object="$xdir$pic_object"
-
-           if test "$prev" = dlfiles; then
-             if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-               dlfiles="$dlfiles $pic_object"
-               prev=
-               continue
-             else
-               # If libtool objects are unsupported, then we need to preload.
-               prev=dlprefiles
-             fi
-           fi
-
-           # CHECK ME:  I think I busted this.  -Ossama
-           if test "$prev" = dlprefiles; then
-             # Preload the old-style object.
-             dlprefiles="$dlprefiles $pic_object"
-             prev=
-           fi
-
-           # A PIC object.
-           libobjs="$libobjs $pic_object"
-           arg="$pic_object"
-         fi
-
-         # Non-PIC object.
-         if test "$non_pic_object" != none; then
-           # Prepend the subdirectory the object is found in.
-           non_pic_object="$xdir$non_pic_object"
-
-           # A standard non-PIC object
-           non_pic_objects="$non_pic_objects $non_pic_object"
-           if test -z "$pic_object" || test "$pic_object" = none ; then
-             arg="$non_pic_object"
-           fi
-         else
-           # If the PIC object exists, use it instead.
-           # $xdir was prepended to $pic_object above.
-           non_pic_object="$pic_object"
-           non_pic_objects="$non_pic_objects $non_pic_object"
-         fi
-       else
-         # Only an error if not doing a dry-run.
-         if test -z "$run"; then
-           $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-           exit $EXIT_FAILURE
-         else
-           # Dry-run case.
-
-           # Extract subdirectory from the argument.
-           xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-           if test "X$xdir" = "X$arg"; then
-             xdir=
-           else
-             xdir="$xdir/"
-           fi
-
-           pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-           non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-           libobjs="$libobjs $pic_object"
-           non_pic_objects="$non_pic_objects $non_pic_object"
-         fi
-       fi
-       ;;
-
-      *.$libext)
-       # An archive.
-       deplibs="$deplibs $arg"
-       old_deplibs="$old_deplibs $arg"
-       continue
-       ;;
-
-      *.la)
-       # A libtool-controlled library.
-
-       if test "$prev" = dlfiles; then
-         # This library was specified with -dlopen.
-         dlfiles="$dlfiles $arg"
-         prev=
-       elif test "$prev" = dlprefiles; then
-         # The library was specified with -dlpreopen.
-         dlprefiles="$dlprefiles $arg"
-         prev=
-       else
-         deplibs="$deplibs $arg"
-       fi
-       continue
-       ;;
-
-      # Some other compiler argument.
-      *)
-       # Unknown arguments in both finalize_command and compile_command need
-       # to be aesthetically quoted because they are evaled later.
-       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-       case $arg in
-       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \   ]*|*]*|"")
-         arg="\"$arg\""
-         ;;
-       esac
-       ;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-       compile_command="$compile_command $arg"
-       finalize_command="$finalize_command $arg"
-      fi
-    done # argument parsing loop
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      compile_command="$compile_command $arg"
-      finalize_command="$finalize_command $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
-    libobjs_save="$libobjs"
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$output_objdir" = "X$output"; then
-      output_objdir="$objdir"
-    else
-      output_objdir="$output_objdir/$objdir"
-    fi
-    # Create the object directory.
-    if test ! -d "$output_objdir"; then
-      $show "$mkdir $output_objdir"
-      $run $mkdir $output_objdir
-      exit_status=$?
-      if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
-       exit $exit_status
-      fi
-    fi
-
-    # Determine the type of output
-    case $output in
-    "")
-      $echo "$modename: you must specify an output file" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    case $host in
-    *cygwin* | *mingw* | *pw32*)
-      # don't eliminate duplications in $postdeps and $predeps
-      duplicate_compiler_generated_deps=yes
-      ;;
-    *)
-      duplicate_compiler_generated_deps=$duplicate_deps
-      ;;
-    esac
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if test "X$duplicate_deps" = "Xyes" ; then
-       case "$libs " in
-       *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-       esac
-      fi
-      libs="$libs $deplib"
-    done
-
-    if test "$linkmode" = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
-       for pre_post_dep in $predeps $postdeps; do
-         case "$pre_post_deps " in
-         *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-         esac
-         pre_post_deps="$pre_post_deps $pre_post_dep"
-       done
-      fi
-      pre_post_deps=
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    case $linkmode in
-    lib)
-       passes="conv link"
-       for file in $dlfiles $dlprefiles; do
-         case $file in
-         *.la) ;;
-         *)
-           $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-           exit $EXIT_FAILURE
-           ;;
-         esac
-       done
-       ;;
-    prog)
-       compile_deplibs=
-       finalize_deplibs=
-       alldeplibs=no
-       newdlfiles=
-       newdlprefiles=
-       passes="conv scan dlopen dlpreopen link"
-       ;;
-    *)  passes="conv"
-       ;;
-    esac
-    for pass in $passes; do
-      if test "$linkmode,$pass" = "lib,link" ||
-        test "$linkmode,$pass" = "prog,scan"; then
-       libs="$deplibs"
-       deplibs=
-      fi
-      if test "$linkmode" = prog; then
-       case $pass in
-       dlopen) libs="$dlfiles" ;;
-       dlpreopen) libs="$dlprefiles" ;;
-       link)
-         libs="$deplibs %DEPLIBS%"
-         test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-         ;;
-       esac
-      fi
-      if test "$pass" = dlopen; then
-       # Collect dlpreopened libraries
-       save_deplibs="$deplibs"
-       deplibs=
-      fi
-      for deplib in $libs; do
-       lib=
-       found=no
-       case $deplib in
-       -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-         if test "$linkmode,$pass" = "prog,link"; then
-           compile_deplibs="$deplib $compile_deplibs"
-           finalize_deplibs="$deplib $finalize_deplibs"
-         else
-           compiler_flags="$compiler_flags $deplib"
-         fi
-         continue
-         ;;
-       -l*)
-         if test "$linkmode" != lib && test "$linkmode" != prog; then
-           $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
-           continue
-         fi
-         name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-         for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-           for search_ext in .la $std_shrext .so .a; do
-             # Search the libtool library
-             lib="$searchdir/lib${name}${search_ext}"
-             if test -f "$lib"; then
-               if test "$search_ext" = ".la"; then
-                 found=yes
-               else
-                 found=no
-               fi
-               break 2
-             fi
-           done
-         done
-         if test "$found" != yes; then
-           # deplib doesn't seem to be a libtool library
-           if test "$linkmode,$pass" = "prog,link"; then
-             compile_deplibs="$deplib $compile_deplibs"
-             finalize_deplibs="$deplib $finalize_deplibs"
-           else
-             deplibs="$deplib $deplibs"
-             test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-           fi
-           continue
-         else # deplib is a libtool library
-           # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-           # We need to do some special things here, and not later.
-           if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-             case " $predeps $postdeps " in
-             *" $deplib "*)
-               if (${SED} -e '2q' $lib |
-                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-                 library_names=
-                 old_library=
-                 case $lib in
-                 */* | *\\*) . $lib ;;
-                 *) . ./$lib ;;
-                 esac
-                 for l in $old_library $library_names; do
-                   ll="$l"
-                 done
-                 if test "X$ll" = "X$old_library" ; then # only static version available
-                   found=no
-                   ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-                   test "X$ladir" = "X$lib" && ladir="."
-                   lib=$ladir/$old_library
-                   if test "$linkmode,$pass" = "prog,link"; then
-                     compile_deplibs="$deplib $compile_deplibs"
-                     finalize_deplibs="$deplib $finalize_deplibs"
-                   else
-                     deplibs="$deplib $deplibs"
-                     test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-                   fi
-                   continue
-                 fi
-               fi
-               ;;
-             *) ;;
-             esac
-           fi
-         fi
-         ;; # -l
-       -L*)
-         case $linkmode in
-         lib)
-           deplibs="$deplib $deplibs"
-           test "$pass" = conv && continue
-           newdependency_libs="$deplib $newdependency_libs"
-           newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-           ;;
-         prog)
-           if test "$pass" = conv; then
-             deplibs="$deplib $deplibs"
-             continue
-           fi
-           if test "$pass" = scan; then
-             deplibs="$deplib $deplibs"
-           else
-             compile_deplibs="$deplib $compile_deplibs"
-             finalize_deplibs="$deplib $finalize_deplibs"
-           fi
-           newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-           ;;
-         *)
-           $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-           ;;
-         esac # linkmode
-         continue
-         ;; # -L
-       -R*)
-         if test "$pass" = link; then
-           dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
-           # Make sure the xrpath contains only unique directories.
-           case "$xrpath " in
-           *" $dir "*) ;;
-           *) xrpath="$xrpath $dir" ;;
-           esac
-         fi
-         deplibs="$deplib $deplibs"
-         continue
-         ;;
-       *.la) lib="$deplib" ;;
-       *.$libext)
-         if test "$pass" = conv; then
-           deplibs="$deplib $deplibs"
-           continue
-         fi
-         case $linkmode in
-         lib)
-           valid_a_lib=no
-           case $deplibs_check_method in
-             match_pattern*)
-               set dummy $deplibs_check_method
-               match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-               if eval $echo \"$deplib\" 2>/dev/null \
-                   | $SED 10q \
-                   | $EGREP "$match_pattern_regex" > /dev/null; then
-                 valid_a_lib=yes
-               fi
-               ;;
-             pass_all)
-               valid_a_lib=yes
-               ;;
-            esac
-           if test "$valid_a_lib" != yes; then
-             $echo
-             $echo "*** Warning: Trying to link with static lib archive $deplib."
-             $echo "*** I have the capability to make that library automatically link in when"
-             $echo "*** you link to this library.  But I can only do this if you have a"
-             $echo "*** shared version of the library, which you do not appear to have"
-             $echo "*** because the file extensions .$libext of this argument makes me believe"
-             $echo "*** that it is just a static archive that I should not used here."
-           else
-             $echo
-             $echo "*** Warning: Linking the shared library $output against the"
-             $echo "*** static library $deplib is not portable!"
-             deplibs="$deplib $deplibs"
-           fi
-           continue
-           ;;
-         prog)
-           if test "$pass" != link; then
-             deplibs="$deplib $deplibs"
-           else
-             compile_deplibs="$deplib $compile_deplibs"
-             finalize_deplibs="$deplib $finalize_deplibs"
-           fi
-           continue
-           ;;
-         esac # linkmode
-         ;; # *.$libext
-       *.lo | *.$objext)
-         if test "$pass" = conv; then
-           deplibs="$deplib $deplibs"
-         elif test "$linkmode" = prog; then
-           if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-             # If there is no dlopen support or we're linking statically,
-             # we need to preload.
-             newdlprefiles="$newdlprefiles $deplib"
-             compile_deplibs="$deplib $compile_deplibs"
-             finalize_deplibs="$deplib $finalize_deplibs"
-           else
-             newdlfiles="$newdlfiles $deplib"
-           fi
-         fi
-         continue
-         ;;
-       %DEPLIBS%)
-         alldeplibs=yes
-         continue
-         ;;
-       esac # case $deplib
-       if test "$found" = yes || test -f "$lib"; then :
-       else
-         $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
-         exit $EXIT_FAILURE
-       fi
-
-       # Check to see that this really is a libtool archive.
-       if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-       else
-         $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-         exit $EXIT_FAILURE
-       fi
-
-       ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-       test "X$ladir" = "X$lib" && ladir="."
-
-       dlname=
-       dlopen=
-       dlpreopen=
-       libdir=
-       library_names=
-       old_library=
-       # If the library was installed with an old release of libtool,
-       # it will not redefine variables installed, or shouldnotlink
-       installed=yes
-       shouldnotlink=no
-       avoidtemprpath=
-
-
-       # Read the .la file
-       case $lib in
-       */* | *\\*) . $lib ;;
-       *) . ./$lib ;;
-       esac
-
-       if test "$linkmode,$pass" = "lib,link" ||
-          test "$linkmode,$pass" = "prog,scan" ||
-          { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-         test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-         test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-       fi
-
-       if test "$pass" = conv; then
-         # Only check for convenience libraries
-         deplibs="$lib $deplibs"
-         if test -z "$libdir"; then
-           if test -z "$old_library"; then
-             $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-             exit $EXIT_FAILURE
-           fi
-           # It is a libtool convenience library, so add in its objects.
-           convenience="$convenience $ladir/$objdir/$old_library"
-           old_convenience="$old_convenience $ladir/$objdir/$old_library"
-           tmp_libs=
-           for deplib in $dependency_libs; do
-             deplibs="$deplib $deplibs"
-              if test "X$duplicate_deps" = "Xyes" ; then
-               case "$tmp_libs " in
-               *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-               esac
-              fi
-             tmp_libs="$tmp_libs $deplib"
-           done
-         elif test "$linkmode" != prog && test "$linkmode" != lib; then
-           $echo "$modename: \`$lib' is not a convenience library" 1>&2
-           exit $EXIT_FAILURE
-         fi
-         continue
-       fi # $pass = conv
-
-
-       # Get the name of the library we link against.
-       linklib=
-       for l in $old_library $library_names; do
-         linklib="$l"
-       done
-       if test -z "$linklib"; then
-         $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-         exit $EXIT_FAILURE
-       fi
-
-       # This library was specified with -dlopen.
-       if test "$pass" = dlopen; then
-         if test -z "$libdir"; then
-           $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-           exit $EXIT_FAILURE
-         fi
-         if test -z "$dlname" ||
-            test "$dlopen_support" != yes ||
-            test "$build_libtool_libs" = no; then
-           # If there is no dlname, no dlopen support or we're linking
-           # statically, we need to preload.  We also need to preload any
-           # dependent libraries so libltdl's deplib preloader doesn't
-           # bomb out in the load deplibs phase.
-           dlprefiles="$dlprefiles $lib $dependency_libs"
-         else
-           newdlfiles="$newdlfiles $lib"
-         fi
-         continue
-       fi # $pass = dlopen
-
-       # We need an absolute path.
-       case $ladir in
-       [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-       *)
-         abs_ladir=`cd "$ladir" && pwd`
-         if test -z "$abs_ladir"; then
-           $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
-           $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
-           abs_ladir="$ladir"
-         fi
-         ;;
-       esac
-       laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-
-       # Find the relevant object directory and library name.
-       if test "X$installed" = Xyes; then
-         if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-           $echo "$modename: warning: library \`$lib' was moved." 1>&2
-           dir="$ladir"
-           absdir="$abs_ladir"
-           libdir="$abs_ladir"
-         else
-           dir="$libdir"
-           absdir="$libdir"
-         fi
-         test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-       else
-         if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-           dir="$ladir"
-           absdir="$abs_ladir"
-           # Remove this search path later
-           notinst_path="$notinst_path $abs_ladir"
-         else
-           dir="$ladir/$objdir"
-           absdir="$abs_ladir/$objdir"
-           # Remove this search path later
-           notinst_path="$notinst_path $abs_ladir"
-         fi
-       fi # $installed = yes
-       name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-
-       # This library was specified with -dlpreopen.
-       if test "$pass" = dlpreopen; then
-         if test -z "$libdir"; then
-           $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-           exit $EXIT_FAILURE
-         fi
-         # Prefer using a static library (so that no silly _DYNAMIC symbols
-         # are required to link).
-         if test -n "$old_library"; then
-           newdlprefiles="$newdlprefiles $dir/$old_library"
-         # Otherwise, use the dlname, so that lt_dlopen finds it.
-         elif test -n "$dlname"; then
-           newdlprefiles="$newdlprefiles $dir/$dlname"
-         else
-           newdlprefiles="$newdlprefiles $dir/$linklib"
-         fi
-       fi # $pass = dlpreopen
-
-       if test -z "$libdir"; then
-         # Link the convenience library
-         if test "$linkmode" = lib; then
-           deplibs="$dir/$old_library $deplibs"
-         elif test "$linkmode,$pass" = "prog,link"; then
-           compile_deplibs="$dir/$old_library $compile_deplibs"
-           finalize_deplibs="$dir/$old_library $finalize_deplibs"
-         else
-           deplibs="$lib $deplibs" # used for prog,scan pass
-         fi
-         continue
-       fi
-
-
-       if test "$linkmode" = prog && test "$pass" != link; then
-         newlib_search_path="$newlib_search_path $ladir"
-         deplibs="$lib $deplibs"
-
-         linkalldeplibs=no
-         if test "$link_all_deplibs" != no || test -z "$library_names" ||
-            test "$build_libtool_libs" = no; then
-           linkalldeplibs=yes
-         fi
-
-         tmp_libs=
-         for deplib in $dependency_libs; do
-           case $deplib in
-           -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
-           esac
-           # Need to link against all dependency_libs?
-           if test "$linkalldeplibs" = yes; then
-             deplibs="$deplib $deplibs"
-           else
-             # Need to hardcode shared library paths
-             # or/and link against static libraries
-             newdependency_libs="$deplib $newdependency_libs"
-           fi
-           if test "X$duplicate_deps" = "Xyes" ; then
-             case "$tmp_libs " in
-             *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-             esac
-           fi
-           tmp_libs="$tmp_libs $deplib"
-         done # for deplib
-         continue
-       fi # $linkmode = prog...
-
-       if test "$linkmode,$pass" = "prog,link"; then
-         if test -n "$library_names" &&
-            { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-           # We need to hardcode the library path
-           if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
-             # Make sure the rpath contains only unique directories.
-             case "$temp_rpath " in
-             *" $dir "*) ;;
-             *" $absdir "*) ;;
-             *) temp_rpath="$temp_rpath $absdir" ;;
-             esac
-           fi
-
-           # Hardcode the library path.
-           # Skip directories that are in the system default run-time
-           # search path.
-           case " $sys_lib_dlsearch_path " in
-           *" $absdir "*) ;;
-           *)
-             case "$compile_rpath " in
-             *" $absdir "*) ;;
-             *) compile_rpath="$compile_rpath $absdir"
-             esac
-             ;;
-           esac
-           case " $sys_lib_dlsearch_path " in
-           *" $libdir "*) ;;
-           *)
-             case "$finalize_rpath " in
-             *" $libdir "*) ;;
-             *) finalize_rpath="$finalize_rpath $libdir"
-             esac
-             ;;
-           esac
-         fi # $linkmode,$pass = prog,link...
-
-         if test "$alldeplibs" = yes &&
-            { test "$deplibs_check_method" = pass_all ||
-              { test "$build_libtool_libs" = yes &&
-                test -n "$library_names"; }; }; then
-           # We only need to search for static libraries
-           continue
-         fi
-       fi
-
-       link_static=no # Whether the deplib will be linked statically
-       use_static_libs=$prefer_static_libs
-       if test "$use_static_libs" = built && test "$installed" = yes ; then
-         use_static_libs=no
-       fi
-       if test -n "$library_names" &&
-          { test "$use_static_libs" = no || test -z "$old_library"; }; then
-         if test "$installed" = no; then
-           notinst_deplibs="$notinst_deplibs $lib"
-           need_relink=yes
-         fi
-         # This is a shared library
-
-         # Warn about portability, can't link against -module's on
-         # some systems (darwin)
-         if test "$shouldnotlink" = yes && test "$pass" = link ; then
-           $echo
-           if test "$linkmode" = prog; then
-             $echo "*** Warning: Linking the executable $output against the loadable module"
-           else
-             $echo "*** Warning: Linking the shared library $output against the loadable module"
-           fi
-           $echo "*** $linklib is not portable!"
-         fi
-         if test "$linkmode" = lib &&
-            test "$hardcode_into_libs" = yes; then
-           # Hardcode the library path.
-           # Skip directories that are in the system default run-time
-           # search path.
-           case " $sys_lib_dlsearch_path " in
-           *" $absdir "*) ;;
-           *)
-             case "$compile_rpath " in
-             *" $absdir "*) ;;
-             *) compile_rpath="$compile_rpath $absdir"
-             esac
-             ;;
-           esac
-           case " $sys_lib_dlsearch_path " in
-           *" $libdir "*) ;;
-           *)
-             case "$finalize_rpath " in
-             *" $libdir "*) ;;
-             *) finalize_rpath="$finalize_rpath $libdir"
-             esac
-             ;;
-           esac
-         fi
-
-         if test -n "$old_archive_from_expsyms_cmds"; then
-           # figure out the soname
-           set dummy $library_names
-           realname="$2"
-           shift; shift
-           libname=`eval \\$echo \"$libname_spec\"`
-           # use dlname if we got it. it's perfectly good, no?
-           if test -n "$dlname"; then
-             soname="$dlname"
-           elif test -n "$soname_spec"; then
-             # bleh windows
-             case $host in
-             *cygwin* | mingw*)
-               major=`expr $current - $age`
-               versuffix="-$major"
-               ;;
-             esac
-             eval soname=\"$soname_spec\"
-           else
-             soname="$realname"
-           fi
-
-           # Make a new name for the extract_expsyms_cmds to use
-           soroot="$soname"
-           soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
-           newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
-
-           # If the library has no export list, then create one now
-           if test -f "$output_objdir/$soname-def"; then :
-           else
-             $show "extracting exported symbol list from \`$soname'"
-             save_ifs="$IFS"; IFS='~'
-             cmds=$extract_expsyms_cmds
-             for cmd in $cmds; do
-               IFS="$save_ifs"
-               eval cmd=\"$cmd\"
-               $show "$cmd"
-               $run eval "$cmd" || exit $?
-             done
-             IFS="$save_ifs"
-           fi
-
-           # Create $newlib
-           if test -f "$output_objdir/$newlib"; then :; else
-             $show "generating import library for \`$soname'"
-             save_ifs="$IFS"; IFS='~'
-             cmds=$old_archive_from_expsyms_cmds
-             for cmd in $cmds; do
-               IFS="$save_ifs"
-               eval cmd=\"$cmd\"
-               $show "$cmd"
-               $run eval "$cmd" || exit $?
-             done
-             IFS="$save_ifs"
-           fi
-           # make sure the library variables are pointing to the new library
-           dir=$output_objdir
-           linklib=$newlib
-         fi # test -n "$old_archive_from_expsyms_cmds"
-
-         if test "$linkmode" = prog || test "$mode" != relink; then
-           add_shlibpath=
-           add_dir=
-           add=
-           lib_linked=yes
-           case $hardcode_action in
-           immediate | unsupported)
-             if test "$hardcode_direct" = no; then
-               add="$dir/$linklib"
-               case $host in
-                 *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
-                 *-*-sysv4*uw2*) add_dir="-L$dir" ;;
-                 *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-                   *-*-unixware7*) add_dir="-L$dir" ;;
-                 *-*-darwin* )
-                   # if the lib is a module then we can not link against
-                   # it, someone is ignoring the new warnings I added
-                   if /usr/bin/file -L $add 2> /dev/null |
-                      $EGREP ": [^:]* bundle" >/dev/null ; then
-                     $echo "** Warning, lib $linklib is a module, not a shared library"
-                     if test -z "$old_library" ; then
-                       $echo
-                       $echo "** And there doesn't seem to be a static archive available"
-                       $echo "** The link will probably fail, sorry"
-                     else
-                       add="$dir/$old_library"
-                     fi
-                   fi
-               esac
-             elif test "$hardcode_minus_L" = no; then
-               case $host in
-               *-*-sunos*) add_shlibpath="$dir" ;;
-               esac
-               add_dir="-L$dir"
-               add="-l$name"
-             elif test "$hardcode_shlibpath_var" = no; then
-               add_shlibpath="$dir"
-               add="-l$name"
-             else
-               lib_linked=no
-             fi
-             ;;
-           relink)
-             if test "$hardcode_direct" = yes; then
-               add="$dir/$linklib"
-             elif test "$hardcode_minus_L" = yes; then
-               add_dir="-L$dir"
-               # Try looking first in the location we're being installed to.
-               if test -n "$inst_prefix_dir"; then
-                 case $libdir in
-                   [\\/]*)
-                     add_dir="$add_dir -L$inst_prefix_dir$libdir"
-                     ;;
-                 esac
-               fi
-               add="-l$name"
-             elif test "$hardcode_shlibpath_var" = yes; then
-               add_shlibpath="$dir"
-               add="-l$name"
-             else
-               lib_linked=no
-             fi
-             ;;
-           *) lib_linked=no ;;
-           esac
-
-           if test "$lib_linked" != yes; then
-             $echo "$modename: configuration error: unsupported hardcode properties"
-             exit $EXIT_FAILURE
-           fi
-
-           if test -n "$add_shlibpath"; then
-             case :$compile_shlibpath: in
-             *":$add_shlibpath:"*) ;;
-             *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-             esac
-           fi
-           if test "$linkmode" = prog; then
-             test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-             test -n "$add" && compile_deplibs="$add $compile_deplibs"
-           else
-             test -n "$add_dir" && deplibs="$add_dir $deplibs"
-             test -n "$add" && deplibs="$add $deplibs"
-             if test "$hardcode_direct" != yes && \
-                test "$hardcode_minus_L" != yes && \
-                test "$hardcode_shlibpath_var" = yes; then
-               case :$finalize_shlibpath: in
-               *":$libdir:"*) ;;
-               *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-               esac
-             fi
-           fi
-         fi
-
-         if test "$linkmode" = prog || test "$mode" = relink; then
-           add_shlibpath=
-           add_dir=
-           add=
-           # Finalize command for both is simple: just hardcode it.
-           if test "$hardcode_direct" = yes; then
-             add="$libdir/$linklib"
-           elif test "$hardcode_minus_L" = yes; then
-             add_dir="-L$libdir"
-             add="-l$name"
-           elif test "$hardcode_shlibpath_var" = yes; then
-             case :$finalize_shlibpath: in
-             *":$libdir:"*) ;;
-             *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-             esac
-             add="-l$name"
-           elif test "$hardcode_automatic" = yes; then
-             if test -n "$inst_prefix_dir" &&
-                test -f "$inst_prefix_dir$libdir/$linklib" ; then
-               add="$inst_prefix_dir$libdir/$linklib"
-             else
-               add="$libdir/$linklib"
-             fi
-           else
-             # We cannot seem to hardcode it, guess we'll fake it.
-             add_dir="-L$libdir"
-             # Try looking first in the location we're being installed to.
-             if test -n "$inst_prefix_dir"; then
-               case $libdir in
-                 [\\/]*)
-                   add_dir="$add_dir -L$inst_prefix_dir$libdir"
-                   ;;
-               esac
-             fi
-             add="-l$name"
-           fi
-
-           if test "$linkmode" = prog; then
-             test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-             test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-           else
-             test -n "$add_dir" && deplibs="$add_dir $deplibs"
-             test -n "$add" && deplibs="$add $deplibs"
-           fi
-         fi
-       elif test "$linkmode" = prog; then
-         # Here we assume that one of hardcode_direct or hardcode_minus_L
-         # is not unsupported.  This is valid on all known static and
-         # shared platforms.
-         if test "$hardcode_direct" != unsupported; then
-           test -n "$old_library" && linklib="$old_library"
-           compile_deplibs="$dir/$linklib $compile_deplibs"
-           finalize_deplibs="$dir/$linklib $finalize_deplibs"
-         else
-           compile_deplibs="-l$name -L$dir $compile_deplibs"
-           finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-         fi
-       elif test "$build_libtool_libs" = yes; then
-         # Not a shared library
-         if test "$deplibs_check_method" != pass_all; then
-           # We're trying link a shared library against a static one
-           # but the system doesn't support it.
-
-           # Just print a warning and add the library to dependency_libs so
-           # that the program can be linked against the static library.
-           $echo
-           $echo "*** Warning: This system can not link to static lib archive $lib."
-           $echo "*** I have the capability to make that library automatically link in when"
-           $echo "*** you link to this library.  But I can only do this if you have a"
-           $echo "*** shared version of the library, which you do not appear to have."
-           if test "$module" = yes; then
-             $echo "*** But as you try to build a module library, libtool will still create "
-             $echo "*** a static module, that should work as long as the dlopening application"
-             $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-             if test -z "$global_symbol_pipe"; then
-               $echo
-               $echo "*** However, this would only work if libtool was able to extract symbol"
-               $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-               $echo "*** not find such a program.  So, this module is probably useless."
-               $echo "*** \`nm' from GNU binutils and a full rebuild may help."
-             fi
-             if test "$build_old_libs" = no; then
-               build_libtool_libs=module
-               build_old_libs=yes
-             else
-               build_libtool_libs=no
-             fi
-           fi
-         else
-           deplibs="$dir/$old_library $deplibs"
-           link_static=yes
-         fi
-       fi # link shared/static library?
-
-       if test "$linkmode" = lib; then
-         if test -n "$dependency_libs" &&
-            { test "$hardcode_into_libs" != yes ||
-              test "$build_old_libs" = yes ||
-              test "$link_static" = yes; }; then
-           # Extract -R from dependency_libs
-           temp_deplibs=
-           for libdir in $dependency_libs; do
-             case $libdir in
-             -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
-                  case " $xrpath " in
-                  *" $temp_xrpath "*) ;;
-                  *) xrpath="$xrpath $temp_xrpath";;
-                  esac;;
-             *) temp_deplibs="$temp_deplibs $libdir";;
-             esac
-           done
-           dependency_libs="$temp_deplibs"
-         fi
-
-         newlib_search_path="$newlib_search_path $absdir"
-         # Link against this library
-         test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-         # ... and its dependency_libs
-         tmp_libs=
-         for deplib in $dependency_libs; do
-           newdependency_libs="$deplib $newdependency_libs"
-           if test "X$duplicate_deps" = "Xyes" ; then
-             case "$tmp_libs " in
-             *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-             esac
-           fi
-           tmp_libs="$tmp_libs $deplib"
-         done
-
-         if test "$link_all_deplibs" != no; then
-           # Add the search paths of all dependency libraries
-           for deplib in $dependency_libs; do
-             case $deplib in
-             -L*) path="$deplib" ;;
-             *.la)
-               dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
-               test "X$dir" = "X$deplib" && dir="."
-               # We need an absolute path.
-               case $dir in
-               [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-               *)
-                 absdir=`cd "$dir" && pwd`
-                 if test -z "$absdir"; then
-                   $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
-                   absdir="$dir"
-                 fi
-                 ;;
-               esac
-               if grep "^installed=no" $deplib > /dev/null; then
-                 path="$absdir/$objdir"
-               else
-                 eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-                 if test -z "$libdir"; then
-                   $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-                   exit $EXIT_FAILURE
-                 fi
-                 if test "$absdir" != "$libdir"; then
-                   $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-                 fi
-                 path="$absdir"
-               fi
-               depdepl=
-               case $host in
-               *-*-darwin*)
-                 # we do not want to link against static libs,
-                 # but need to link against shared
-                 eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-                 if test -n "$deplibrary_names" ; then
-                   for tmp in $deplibrary_names ; do
-                     depdepl=$tmp
-                   done
-                   if test -f "$path/$depdepl" ; then
-                     depdepl="$path/$depdepl"
-                   fi
-                   # do not add paths which are already there
-                   case " $newlib_search_path " in
-                   *" $path "*) ;;
-                   *) newlib_search_path="$newlib_search_path $path";;
-                   esac
-                 fi
-                 path=""
-                 ;;
-               *)
-                 path="-L$path"
-                 ;;
-               esac
-               ;;
-             -l*)
-               case $host in
-               *-*-darwin*)
-                 # Again, we only want to link against shared libraries
-                 eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-                 for tmp in $newlib_search_path ; do
-                   if test -f "$tmp/lib$tmp_libs.dylib" ; then
-                     eval depdepl="$tmp/lib$tmp_libs.dylib"
-                     break
-                   fi
-                 done
-                 path=""
-                 ;;
-               *) continue ;;
-               esac
-               ;;
-             *) continue ;;
-             esac
-             case " $deplibs " in
-             *" $path "*) ;;
-             *) deplibs="$path $deplibs" ;;
-             esac
-             case " $deplibs " in
-             *" $depdepl "*) ;;
-             *) deplibs="$depdepl $deplibs" ;;
-             esac
-           done
-         fi # link_all_deplibs != no
-       fi # linkmode = lib
-      done # for deplib in $libs
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
-       # Link the dlpreopened libraries before other libraries
-       for deplib in $save_deplibs; do
-         deplibs="$deplib $deplibs"
-       done
-      fi
-      if test "$pass" != dlopen; then
-       if test "$pass" != conv; then
-         # Make sure lib_search_path contains only unique directories.
-         lib_search_path=
-         for dir in $newlib_search_path; do
-           case "$lib_search_path " in
-           *" $dir "*) ;;
-           *) lib_search_path="$lib_search_path $dir" ;;
-           esac
-         done
-         newlib_search_path=
-       fi
-
-       if test "$linkmode,$pass" != "prog,link"; then
-         vars="deplibs"
-       else
-         vars="compile_deplibs finalize_deplibs"
-       fi
-       for var in $vars dependency_libs; do
-         # Add libraries to $var in reverse order
-         eval tmp_libs=\"\$$var\"
-         new_libs=
-         for deplib in $tmp_libs; do
-           # FIXME: Pedantically, this is the right thing to do, so
-           #        that some nasty dependency loop isn't accidentally
-           #        broken:
-           #new_libs="$deplib $new_libs"
-           # Pragmatically, this seems to cause very few problems in
-           # practice:
-           case $deplib in
-           -L*) new_libs="$deplib $new_libs" ;;
-           -R*) ;;
-           *)
-             # And here is the reason: when a library appears more
-             # than once as an explicit dependence of a library, or
-             # is implicitly linked in more than once by the
-             # compiler, it is considered special, and multiple
-             # occurrences thereof are not removed.  Compare this
-             # with having the same library being listed as a
-             # dependency of multiple other libraries: in this case,
-             # we know (pedantically, we assume) the library does not
-             # need to be listed more than once, so we keep only the
-             # last copy.  This is not always right, but it is rare
-             # enough that we require users that really mean to play
-             # such unportable linking tricks to link the library
-             # using -Wl,-lname, so that libtool does not consider it
-             # for duplicate removal.
-             case " $specialdeplibs " in
-             *" $deplib "*) new_libs="$deplib $new_libs" ;;
-             *)
-               case " $new_libs " in
-               *" $deplib "*) ;;
-               *) new_libs="$deplib $new_libs" ;;
-               esac
-               ;;
-             esac
-             ;;
-           esac
-         done
-         tmp_libs=
-         for deplib in $new_libs; do
-           case $deplib in
-           -L*)
-             case " $tmp_libs " in
-             *" $deplib "*) ;;
-             *) tmp_libs="$tmp_libs $deplib" ;;
-             esac
-             ;;
-           *) tmp_libs="$tmp_libs $deplib" ;;
-           esac
-         done
-         eval $var=\"$tmp_libs\"
-       done # for var
-      fi
-      # Last step: remove runtime libs from dependency_libs
-      # (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs ; do
-       case " $predeps $postdeps $compiler_lib_search_path " in
-       *" $i "*)
-         i=""
-         ;;
-       esac
-       if test -n "$i" ; then
-         tmp_libs="$tmp_libs $i"
-       fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
-      dlprefiles="$newdlprefiles"
-    fi
-
-    case $linkmode in
-    oldlib)
-      if test -n "$deplibs"; then
-       $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-      fi
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-       $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-       $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-       $echo "$modename: warning: \`-R' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-       $echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$release"; then
-       $echo "$modename: warning: \`-release' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-       $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
-      fi
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs="$output"
-      objs="$objs$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case $outputname in
-      lib*)
-       name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-       eval shared_ext=\"$shrext_cmds\"
-       eval libname=\"$libname_spec\"
-       ;;
-      *)
-       if test "$module" = no; then
-         $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
-         $echo "$help" 1>&2
-         exit $EXIT_FAILURE
-       fi
-       if test "$need_lib_prefix" != no; then
-         # Add the "lib" prefix for modules if required
-         name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-         eval shared_ext=\"$shrext_cmds\"
-         eval libname=\"$libname_spec\"
-       else
-         libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-       fi
-       ;;
-      esac
-
-      if test -n "$objs"; then
-       if test "$deplibs_check_method" != pass_all; then
-         $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-         exit $EXIT_FAILURE
-       else
-         $echo
-         $echo "*** Warning: Linking the shared library $output against the non-libtool"
-         $echo "*** objects $objs is not portable!"
-         libobjs="$libobjs $objs"
-       fi
-      fi
-
-      if test "$dlself" != no; then
-       $echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
-      fi
-
-      set dummy $rpath
-      if test "$#" -gt 2; then
-       $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
-      fi
-      install_libdir="$2"
-
-      oldlibs=
-      if test -z "$rpath"; then
-       if test "$build_libtool_libs" = yes; then
-         # Building a libtool convenience library.
-         # Some compilers have problems with a `.al' extension so
-         # convenience libraries should have the same extension an
-         # archive normally would.
-         oldlibs="$output_objdir/$libname.$libext $oldlibs"
-         build_libtool_libs=convenience
-         build_old_libs=yes
-       fi
-
-       if test -n "$vinfo"; then
-         $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
-       fi
-
-       if test -n "$release"; then
-         $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
-       fi
-      else
-
-       # Parse the version information argument.
-       save_ifs="$IFS"; IFS=':'
-       set dummy $vinfo 0 0 0
-       IFS="$save_ifs"
-
-       if test -n "$8"; then
-         $echo "$modename: too many parameters to \`-version-info'" 1>&2
-         $echo "$help" 1>&2
-         exit $EXIT_FAILURE
-       fi
-
-       # convert absolute version numbers to libtool ages
-       # this retains compatibility with .la files and attempts
-       # to make the code below a bit more comprehensible
-
-       case $vinfo_number in
-       yes)
-         number_major="$2"
-         number_minor="$3"
-         number_revision="$4"
-         #
-         # There are really only two kinds -- those that
-         # use the current revision as the major version
-         # and those that subtract age and use age as
-         # a minor version.  But, then there is irix
-         # which has an extra 1 added just for fun
-         #
-         case $version_type in
-         darwin|linux|osf|windows)
-           current=`expr $number_major + $number_minor`
-           age="$number_minor"
-           revision="$number_revision"
-           ;;
-         freebsd-aout|freebsd-elf|sunos)
-           current="$number_major"
-           revision="$number_minor"
-           age="0"
-           ;;
-         irix|nonstopux)
-           current=`expr $number_major + $number_minor - 1`
-           age="$number_minor"
-           revision="$number_minor"
-           ;;
-         *)
-           $echo "$modename: unknown library version type \`$version_type'" 1>&2
-           $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-           exit $EXIT_FAILURE
-           ;;
-         esac
-         ;;
-       no)
-         current="$2"
-         revision="$3"
-         age="$4"
-         ;;
-       esac
-
-       # Check that each of the things are valid numbers.
-       case $current in
-       0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-       *)
-         $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
-         $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-         exit $EXIT_FAILURE
-         ;;
-       esac
-
-       case $revision in
-       0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-       *)
-         $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
-         $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-         exit $EXIT_FAILURE
-         ;;
-       esac
-
-       case $age in
-       0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-       *)
-         $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
-         $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-         exit $EXIT_FAILURE
-         ;;
-       esac
-
-       if test "$age" -gt "$current"; then
-         $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-         $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-         exit $EXIT_FAILURE
-       fi
-
-       # Calculate the version variables.
-       major=
-       versuffix=
-       verstring=
-       case $version_type in
-       none) ;;
-
-       darwin)
-         # Like Linux, but with the current version available in
-         # verstring for coding it into the library header
-         major=.`expr $current - $age`
-         versuffix="$major.$age.$revision"
-         # Darwin ld doesn't like 0 for these options...
-         minor_current=`expr $current + 1`
-         verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-         ;;
-
-       freebsd-aout)
-         major=".$current"
-         versuffix=".$current.$revision";
-         ;;
-
-       freebsd-elf)
-         major=".$current"
-         versuffix=".$current";
-         ;;
-
-       irix | nonstopux)
-         major=`expr $current - $age + 1`
-
-         case $version_type in
-           nonstopux) verstring_prefix=nonstopux ;;
-           *)         verstring_prefix=sgi ;;
-         esac
-         verstring="$verstring_prefix$major.$revision"
-
-         # Add in all the interfaces that we are compatible with.
-         loop=$revision
-         while test "$loop" -ne 0; do
-           iface=`expr $revision - $loop`
-           loop=`expr $loop - 1`
-           verstring="$verstring_prefix$major.$iface:$verstring"
-         done
-
-         # Before this point, $major must not contain `.'.
-         major=.$major
-         versuffix="$major.$revision"
-         ;;
-
-       linux)
-         major=.`expr $current - $age`
-         versuffix="$major.$age.$revision"
-         ;;
-
-       osf)
-         major=.`expr $current - $age`
-         versuffix=".$current.$age.$revision"
-         verstring="$current.$age.$revision"
-
-         # Add in all the interfaces that we are compatible with.
-         loop=$age
-         while test "$loop" -ne 0; do
-           iface=`expr $current - $loop`
-           loop=`expr $loop - 1`
-           verstring="$verstring:${iface}.0"
-         done
-
-         # Make executables depend on our current version.
-         verstring="$verstring:${current}.0"
-         ;;
-
-       sunos)
-         major=".$current"
-         versuffix=".$current.$revision"
-         ;;
-
-       windows)
-         # Use '-' rather than '.', since we only want one
-         # extension on DOS 8.3 filesystems.
-         major=`expr $current - $age`
-         versuffix="-$major"
-         ;;
-
-       *)
-         $echo "$modename: unknown library version type \`$version_type'" 1>&2
-         $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-         exit $EXIT_FAILURE
-         ;;
-       esac
-
-       # Clear the version info if we defaulted, and they specified a release.
-       if test -z "$vinfo" && test -n "$release"; then
-         major=
-         case $version_type in
-         darwin)
-           # we can't check for "0.0" in archive_cmds due to quoting
-           # problems, so we reset it completely
-           verstring=
-           ;;
-         *)
-           verstring="0.0"
-           ;;
-         esac
-         if test "$need_version" = no; then
-           versuffix=
-         else
-           versuffix=".0.0"
-         fi
-       fi
-
-       # Remove version info from name if versioning should be avoided
-       if test "$avoid_version" = yes && test "$need_version" = no; then
-         major=
-         versuffix=
-         verstring=""
-       fi
-
-       # Check to see if the archive will have undefined symbols.
-       if test "$allow_undefined" = yes; then
-         if test "$allow_undefined_flag" = unsupported; then
-           $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
-           build_libtool_libs=no
-           build_old_libs=yes
-         fi
-       else
-         # Don't allow undefined symbols.
-         allow_undefined_flag="$no_undefined_flag"
-       fi
-      fi
-
-      if test "$mode" != relink; then
-       # Remove our outputs, but don't remove object files since they
-       # may have been created when compiling PIC objects.
-       removelist=
-       tempremovelist=`$echo "$output_objdir/*"`
-       for p in $tempremovelist; do
-         case $p in
-           *.$objext)
-              ;;
-           $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-              if test "X$precious_files_regex" != "X"; then
-                if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-                then
-                  continue
-                fi
-              fi
-              removelist="$removelist $p"
-              ;;
-           *) ;;
-         esac
-       done
-       if test -n "$removelist"; then
-         $show "${rm}r $removelist"
-         $run ${rm}r $removelist
-       fi
-      fi
-
-      # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-       oldlibs="$oldlibs $output_objdir/$libname.$libext"
-
-       # Transform .lo files to .o files.
-       oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-      fi
-
-      # Eliminate all temporary directories.
-      for path in $notinst_path; do
-       lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-       deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-       dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-      done
-
-      if test -n "$xrpath"; then
-       # If the user specified any rpath flags, then add them.
-       temp_xrpath=
-       for libdir in $xrpath; do
-         temp_xrpath="$temp_xrpath -R$libdir"
-         case "$finalize_rpath " in
-         *" $libdir "*) ;;
-         *) finalize_rpath="$finalize_rpath $libdir" ;;
-         esac
-       done
-       if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-         dependency_libs="$temp_xrpath $dependency_libs"
-       fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
-      dlfiles=
-      for lib in $old_dlfiles; do
-       case " $dlprefiles $dlfiles " in
-       *" $lib "*) ;;
-       *) dlfiles="$dlfiles $lib" ;;
-       esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-       case "$dlprefiles " in
-       *" $lib "*) ;;
-       *) dlprefiles="$dlprefiles $lib" ;;
-       esac
-      done
-
-      if test "$build_libtool_libs" = yes; then
-       if test -n "$rpath"; then
-         case $host in
-         *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-           # these systems don't actually have a c library (as such)!
-           ;;
-         *-*-rhapsody* | *-*-darwin1.[012])
-           # Rhapsody C library is in the System framework
-           deplibs="$deplibs -framework System"
-           ;;
-         *-*-netbsd*)
-           # Don't link with libc until the a.out ld.so is fixed.
-           ;;
-         *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-           # Do not include libc due to us having libc/libc_r.
-           ;;
-         *-*-sco3.2v5* | *-*-sco5v6*)
-           # Causes problems with __ctype
-           ;;
-         *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-           # Compiler inserts libc in the correct place for threads to work
-           ;;
-         *)
-           # Add libc to deplibs on all other systems if necessary.
-           if test "$build_libtool_need_lc" = "yes"; then
-             deplibs="$deplibs -lc"
-           fi
-           ;;
-         esac
-       fi
-
-       # Transform deplibs into only deplibs that can be linked in shared.
-       name_save=$name
-       libname_save=$libname
-       release_save=$release
-       versuffix_save=$versuffix
-       major_save=$major
-       # I'm not sure if I'm treating the release correctly.  I think
-       # release should show up in the -l (ie -lgmp5) so we don't want to
-       # add it in twice.  Is that correct?
-       release=""
-       versuffix=""
-       major=""
-       newdeplibs=
-       droppeddeps=no
-       case $deplibs_check_method in
-       pass_all)
-         # Don't check for shared/static.  Everything works.
-         # This might be a little naive.  We might want to check
-         # whether the library exists or not.  But this is on
-         # osf3 & osf4 and I'm not really sure... Just
-         # implementing what was already the behavior.
-         newdeplibs=$deplibs
-         ;;
-       test_compile)
-         # This code stresses the "libraries are programs" paradigm to its
-         # limits. Maybe even breaks it.  We compile a program, linking it
-         # against the deplibs as a proxy for the library.  Then we can check
-         # whether they linked in statically or dynamically with ldd.
-         $rm conftest.c
-         cat > conftest.c <<EOF
-         int main() { return 0; }
-EOF
-         $rm conftest
-         $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
-         if test "$?" -eq 0 ; then
-           ldd_output=`ldd conftest`
-           for i in $deplibs; do
-             name=`expr $i : '-l\(.*\)'`
-             # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" -ne "0"; then
-               if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-                 case " $predeps $postdeps " in
-                 *" $i "*)
-                   newdeplibs="$newdeplibs $i"
-                   i=""
-                   ;;
-                 esac
-               fi
-               if test -n "$i" ; then
-                 libname=`eval \\$echo \"$libname_spec\"`
-                 deplib_matches=`eval \\$echo \"$library_names_spec\"`
-                 set dummy $deplib_matches
-                 deplib_match=$2
-                 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-                   newdeplibs="$newdeplibs $i"
-                 else
-                   droppeddeps=yes
-                   $echo
-                   $echo "*** Warning: dynamic linker does not accept needed library $i."
-                   $echo "*** I have the capability to make that library automatically link in when"
-                   $echo "*** you link to this library.  But I can only do this if you have a"
-                   $echo "*** shared version of the library, which I believe you do not have"
-                   $echo "*** because a test_compile did reveal that the linker did not use it for"
-                   $echo "*** its dynamic dependency list that programs get resolved with at runtime."
-                 fi
-               fi
-             else
-               newdeplibs="$newdeplibs $i"
-             fi
-           done
-         else
-           # Error occurred in the first compile.  Let's try to salvage
-           # the situation: Compile a separate program for each library.
-           for i in $deplibs; do
-             name=`expr $i : '-l\(.*\)'`
-             # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
-               $rm conftest
-               $LTCC $LTCFLAGS -o conftest conftest.c $i
-               # Did it work?
-               if test "$?" -eq 0 ; then
-                 ldd_output=`ldd conftest`
-                 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-                   case " $predeps $postdeps " in
-                   *" $i "*)
-                     newdeplibs="$newdeplibs $i"
-                     i=""
-                     ;;
-                   esac
-                 fi
-                 if test -n "$i" ; then
-                   libname=`eval \\$echo \"$libname_spec\"`
-                   deplib_matches=`eval \\$echo \"$library_names_spec\"`
-                   set dummy $deplib_matches
-                   deplib_match=$2
-                   if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-                     newdeplibs="$newdeplibs $i"
-                   else
-                     droppeddeps=yes
-                     $echo
-                     $echo "*** Warning: dynamic linker does not accept needed library $i."
-                     $echo "*** I have the capability to make that library automatically link in when"
-                     $echo "*** you link to this library.  But I can only do this if you have a"
-                     $echo "*** shared version of the library, which you do not appear to have"
-                     $echo "*** because a test_compile did reveal that the linker did not use this one"
-                     $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-                   fi
-                 fi
-               else
-                 droppeddeps=yes
-                 $echo
-                 $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-                 $echo "***  make it link in!  You will probably need to install it or some"
-                 $echo "*** library that it depends on before this library will be fully"
-                 $echo "*** functional.  Installing it before continuing would be even better."
-               fi
-             else
-               newdeplibs="$newdeplibs $i"
-             fi
-           done
-         fi
-         ;;
-       file_magic*)
-         set dummy $deplibs_check_method
-         file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-         for a_deplib in $deplibs; do
-           name=`expr $a_deplib : '-l\(.*\)'`
-           # If $name is empty we are operating on a -L argument.
-            if test "$name" != "" && test  "$name" != "0"; then
-             if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-               case " $predeps $postdeps " in
-               *" $a_deplib "*)
-                 newdeplibs="$newdeplibs $a_deplib"
-                 a_deplib=""
-                 ;;
-               esac
-             fi
-             if test -n "$a_deplib" ; then
-               libname=`eval \\$echo \"$libname_spec\"`
-               for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-                 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-                 for potent_lib in $potential_libs; do
-                     # Follow soft links.
-                     if ls -lLd "$potent_lib" 2>/dev/null \
-                        | grep " -> " >/dev/null; then
-                       continue
-                     fi
-                     # The statement above tries to avoid entering an
-                     # endless loop below, in case of cyclic links.
-                     # We might still enter an endless loop, since a link
-                     # loop can be closed while we follow links,
-                     # but so what?
-                     potlib="$potent_lib"
-                     while test -h "$potlib" 2>/dev/null; do
-                       potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-                       case $potliblink in
-                       [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-                       *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-                       esac
-                     done
-                     if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-                        | ${SED} 10q \
-                        | $EGREP "$file_magic_regex" > /dev/null; then
-                       newdeplibs="$newdeplibs $a_deplib"
-                       a_deplib=""
-                       break 2
-                     fi
-                 done
-               done
-             fi
-             if test -n "$a_deplib" ; then
-               droppeddeps=yes
-               $echo
-               $echo "*** Warning: linker path does not have real file for library $a_deplib."
-               $echo "*** I have the capability to make that library automatically link in when"
-               $echo "*** you link to this library.  But I can only do this if you have a"
-               $echo "*** shared version of the library, which you do not appear to have"
-               $echo "*** because I did check the linker path looking for a file starting"
-               if test -z "$potlib" ; then
-                 $echo "*** with $libname but no candidates were found. (...for file magic test)"
-               else
-                 $echo "*** with $libname and none of the candidates passed a file format test"
-                 $echo "*** using a file magic. Last file checked: $potlib"
-               fi
-             fi
-           else
-             # Add a -L argument.
-             newdeplibs="$newdeplibs $a_deplib"
-           fi
-         done # Gone through all deplibs.
-         ;;
-       match_pattern*)
-         set dummy $deplibs_check_method
-         match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-         for a_deplib in $deplibs; do
-           name=`expr $a_deplib : '-l\(.*\)'`
-           # If $name is empty we are operating on a -L argument.
-           if test -n "$name" && test "$name" != "0"; then
-             if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-               case " $predeps $postdeps " in
-               *" $a_deplib "*)
-                 newdeplibs="$newdeplibs $a_deplib"
-                 a_deplib=""
-                 ;;
-               esac
-             fi
-             if test -n "$a_deplib" ; then
-               libname=`eval \\$echo \"$libname_spec\"`
-               for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-                 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-                 for potent_lib in $potential_libs; do
-                   potlib="$potent_lib" # see symlink-check above in file_magic test
-                   if eval $echo \"$potent_lib\" 2>/dev/null \
-                       | ${SED} 10q \
-                       | $EGREP "$match_pattern_regex" > /dev/null; then
-                     newdeplibs="$newdeplibs $a_deplib"
-                     a_deplib=""
-                     break 2
-                   fi
-                 done
-               done
-             fi
-             if test -n "$a_deplib" ; then
-               droppeddeps=yes
-               $echo
-               $echo "*** Warning: linker path does not have real file for library $a_deplib."
-               $echo "*** I have the capability to make that library automatically link in when"
-               $echo "*** you link to this library.  But I can only do this if you have a"
-               $echo "*** shared version of the library, which you do not appear to have"
-               $echo "*** because I did check the linker path looking for a file starting"
-               if test -z "$potlib" ; then
-                 $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
-               else
-                 $echo "*** with $libname and none of the candidates passed a file format test"
-                 $echo "*** using a regex pattern. Last file checked: $potlib"
-               fi
-             fi
-           else
-             # Add a -L argument.
-             newdeplibs="$newdeplibs $a_deplib"
-           fi
-         done # Gone through all deplibs.
-         ;;
-       none | unknown | *)
-         newdeplibs=""
-         tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-           -e 's/ -[LR][^ ]*//g'`
-         if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-           for i in $predeps $postdeps ; do
-             # can't use Xsed below, because $i might contain '/'
-             tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
-           done
-         fi
-         if $echo "X $tmp_deplibs" | $Xsed -e 's/[     ]//g' \
-           | grep . >/dev/null; then
-           $echo
-           if test "X$deplibs_check_method" = "Xnone"; then
-             $echo "*** Warning: inter-library dependencies are not supported in this platform."
-           else
-             $echo "*** Warning: inter-library dependencies are not known to be supported."
-           fi
-           $echo "*** All declared inter-library dependencies are being dropped."
-           droppeddeps=yes
-         fi
-         ;;
-       esac
-       versuffix=$versuffix_save
-       major=$major_save
-       release=$release_save
-       libname=$libname_save
-       name=$name_save
-
-       case $host in
-       *-*-rhapsody* | *-*-darwin1.[012])
-         # On Rhapsody replace the C library is the System framework
-         newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
-         ;;
-       esac
-
-       if test "$droppeddeps" = yes; then
-         if test "$module" = yes; then
-           $echo
-           $echo "*** Warning: libtool could not satisfy all declared inter-library"
-           $echo "*** dependencies of module $libname.  Therefore, libtool will create"
-           $echo "*** a static module, that should work as long as the dlopening"
-           $echo "*** application is linked with the -dlopen flag."
-           if test -z "$global_symbol_pipe"; then
-             $echo
-             $echo "*** However, this would only work if libtool was able to extract symbol"
-             $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-             $echo "*** not find such a program.  So, this module is probably useless."
-             $echo "*** \`nm' from GNU binutils and a full rebuild may help."
-           fi
-           if test "$build_old_libs" = no; then
-             oldlibs="$output_objdir/$libname.$libext"
-             build_libtool_libs=module
-             build_old_libs=yes
-           else
-             build_libtool_libs=no
-           fi
-         else
-           $echo "*** The inter-library dependencies that have been dropped here will be"
-           $echo "*** automatically added whenever a program is linked with this library"
-           $echo "*** or is declared to -dlopen it."
-
-           if test "$allow_undefined" = no; then
-             $echo
-             $echo "*** Since this library must not contain undefined symbols,"
-             $echo "*** because either the platform does not support them or"
-             $echo "*** it was explicitly requested with -no-undefined,"
-             $echo "*** libtool will only create a static version of it."
-             if test "$build_old_libs" = no; then
-               oldlibs="$output_objdir/$libname.$libext"
-               build_libtool_libs=module
-               build_old_libs=yes
-             else
-               build_libtool_libs=no
-             fi
-           fi
-         fi
-       fi
-       # Done checking deplibs!
-       deplibs=$newdeplibs
-      fi
-
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-       case " $new_libs " in
-       *" -L$path/$objdir "*) ;;
-       *)
-         case " $deplibs " in
-         *" -L$path/$objdir "*)
-           new_libs="$new_libs -L$path/$objdir" ;;
-         esac
-         ;;
-       esac
-      done
-      for deplib in $deplibs; do
-       case $deplib in
-       -L*)
-         case " $new_libs " in
-         *" $deplib "*) ;;
-         *) new_libs="$new_libs $deplib" ;;
-         esac
-         ;;
-       *) new_libs="$new_libs $deplib" ;;
-       esac
-      done
-      deplibs="$new_libs"
-
-
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
-
-      # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-       if test "$hardcode_into_libs" = yes; then
-         # Hardcode the library paths
-         hardcode_libdirs=
-         dep_rpath=
-         rpath="$finalize_rpath"
-         test "$mode" != relink && rpath="$compile_rpath$rpath"
-         for libdir in $rpath; do
-           if test -n "$hardcode_libdir_flag_spec"; then
-             if test -n "$hardcode_libdir_separator"; then
-               if test -z "$hardcode_libdirs"; then
-                 hardcode_libdirs="$libdir"
-               else
-                 # Just accumulate the unique libdirs.
-                 case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-                 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-                   ;;
-                 *)
-                   hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-                   ;;
-                 esac
-               fi
-             else
-               eval flag=\"$hardcode_libdir_flag_spec\"
-               dep_rpath="$dep_rpath $flag"
-             fi
-           elif test -n "$runpath_var"; then
-             case "$perm_rpath " in
-             *" $libdir "*) ;;
-             *) perm_rpath="$perm_rpath $libdir" ;;
-             esac
-           fi
-         done
-         # Substitute the hardcoded libdirs into the rpath.
-         if test -n "$hardcode_libdir_separator" &&
-            test -n "$hardcode_libdirs"; then
-           libdir="$hardcode_libdirs"
-           if test -n "$hardcode_libdir_flag_spec_ld"; then
-             eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-           else
-             eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-           fi
-         fi
-         if test -n "$runpath_var" && test -n "$perm_rpath"; then
-           # We should set the runpath_var.
-           rpath=
-           for dir in $perm_rpath; do
-             rpath="$rpath$dir:"
-           done
-           eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-         fi
-         test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-       fi
-
-       shlibpath="$finalize_shlibpath"
-       test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-       if test -n "$shlibpath"; then
-         eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-       fi
-
-       # Get the real and link names of the library.
-       eval shared_ext=\"$shrext_cmds\"
-       eval library_names=\"$library_names_spec\"
-       set dummy $library_names
-       realname="$2"
-       shift; shift
-
-       if test -n "$soname_spec"; then
-         eval soname=\"$soname_spec\"
-       else
-         soname="$realname"
-       fi
-       if test -z "$dlname"; then
-         dlname=$soname
-       fi
-
-       lib="$output_objdir/$realname"
-       linknames=
-       for link
-       do
-         linknames="$linknames $link"
-       done
-
-       # Use standard objects if they are pic
-       test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-
-       # Prepare the list of exported symbols
-       if test -z "$export_symbols"; then
-         if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-           $show "generating symbol list for \`$libname.la'"
-           export_symbols="$output_objdir/$libname.exp"
-           $run $rm $export_symbols
-           cmds=$export_symbols_cmds
-           save_ifs="$IFS"; IFS='~'
-           for cmd in $cmds; do
-             IFS="$save_ifs"
-             eval cmd=\"$cmd\"
-             if len=`expr "X$cmd" : ".*"` &&
-              test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-               $show "$cmd"
-               $run eval "$cmd" || exit $?
-               skipped_export=false
-             else
-               # The command line is too long to execute in one step.
-               $show "using reloadable object file for export list..."
-               skipped_export=:
-               # Break out early, otherwise skipped_export may be
-               # set to false by a later but shorter cmd.
-               break
-             fi
-           done
-           IFS="$save_ifs"
-           if test -n "$export_symbols_regex"; then
-             $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-             $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-             $show "$mv \"${export_symbols}T\" \"$export_symbols\""
-             $run eval '$mv "${export_symbols}T" "$export_symbols"'
-           fi
-         fi
-       fi
-
-       if test -n "$export_symbols" && test -n "$include_expsyms"; then
-         $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
-       fi
-
-       tmp_deplibs=
-       for test_deplib in $deplibs; do
-               case " $convenience " in
-               *" $test_deplib "*) ;;
-               *)
-                       tmp_deplibs="$tmp_deplibs $test_deplib"
-                       ;;
-               esac
-       done
-       deplibs="$tmp_deplibs"
-
-       if test -n "$convenience"; then
-         if test -n "$whole_archive_flag_spec"; then
-           save_libobjs=$libobjs
-           eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-         else
-           gentop="$output_objdir/${outputname}x"
-           generated="$generated $gentop"
-
-           func_extract_archives $gentop $convenience
-           libobjs="$libobjs $func_extract_archives_result"
-         fi
-       fi
-       
-       if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-         eval flag=\"$thread_safe_flag_spec\"
-         linker_flags="$linker_flags $flag"
-       fi
-
-       # Make a backup of the uninstalled library when relinking
-       if test "$mode" = relink; then
-         $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
-       fi
-
-       # Do each of the archive commands.
-       if test "$module" = yes && test -n "$module_cmds" ; then
-         if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-           eval test_cmds=\"$module_expsym_cmds\"
-           cmds=$module_expsym_cmds
-         else
-           eval test_cmds=\"$module_cmds\"
-           cmds=$module_cmds
-         fi
-       else
-       if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-         eval test_cmds=\"$archive_expsym_cmds\"
-         cmds=$archive_expsym_cmds
-       else
-         eval test_cmds=\"$archive_cmds\"
-         cmds=$archive_cmds
-         fi
-       fi
-
-       if test "X$skipped_export" != "X:" &&
-          len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-          test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-         :
-       else
-         # The command line is too long to link in one step, link piecewise.
-         $echo "creating reloadable object files..."
-
-         # Save the value of $output and $libobjs because we want to
-         # use them later.  If we have whole_archive_flag_spec, we
-         # want to use save_libobjs as it was before
-         # whole_archive_flag_spec was expanded, because we can't
-         # assume the linker understands whole_archive_flag_spec.
-         # This may have to be revisited, in case too many
-         # convenience libraries get linked in and end up exceeding
-         # the spec.
-         if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-           save_libobjs=$libobjs
-         fi
-         save_output=$output
-         output_la=`$echo "X$output" | $Xsed -e "$basename"`
-
-         # Clear the reloadable object creation command queue and
-         # initialize k to one.
-         test_cmds=
-         concat_cmds=
-         objlist=
-         delfiles=
-         last_robj=
-         k=1
-         output=$output_objdir/$output_la-${k}.$objext
-         # Loop over the list of objects to be linked.
-         for obj in $save_libobjs
-         do
-           eval test_cmds=\"$reload_cmds $objlist $last_robj\"
-           if test "X$objlist" = X ||
-              { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-                test "$len" -le "$max_cmd_len"; }; then
-             objlist="$objlist $obj"
-           else
-             # The command $test_cmds is almost too long, add a
-             # command to the queue.
-             if test "$k" -eq 1 ; then
-               # The first file doesn't have a previous command to add.
-               eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-             else
-               # All subsequent reloadable object files will link in
-               # the last one created.
-               eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
-             fi
-             last_robj=$output_objdir/$output_la-${k}.$objext
-             k=`expr $k + 1`
-             output=$output_objdir/$output_la-${k}.$objext
-             objlist=$obj
-             len=1
-           fi
-         done
-         # Handle the remaining objects by creating one last
-         # reloadable object file.  All subsequent reloadable object
-         # files will link in the last one created.
-         test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-         eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-
-         if ${skipped_export-false}; then
-           $show "generating symbol list for \`$libname.la'"
-           export_symbols="$output_objdir/$libname.exp"
-           $run $rm $export_symbols
-           libobjs=$output
-           # Append the command to create the export file.
-           eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
-          fi
-
-         # Set up a command to remove the reloadable object files
-         # after they are used.
-         i=0
-         while test "$i" -lt "$k"
-         do
-           i=`expr $i + 1`
-           delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
-         done
-
-         $echo "creating a temporary reloadable object file: $output"
-
-         # Loop through the commands generated above and execute them.
-         save_ifs="$IFS"; IFS='~'
-         for cmd in $concat_cmds; do
-           IFS="$save_ifs"
-           $show "$cmd"
-           $run eval "$cmd" || exit $?
-         done
-         IFS="$save_ifs"
-
-         libobjs=$output
-         # Restore the value of output.
-         output=$save_output
-
-         if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-           eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-         fi
-         # Expand the library linking commands again to reset the
-         # value of $libobjs for piecewise linking.
-
-         # Do each of the archive commands.
-         if test "$module" = yes && test -n "$module_cmds" ; then
-           if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-             cmds=$module_expsym_cmds
-           else
-             cmds=$module_cmds
-           fi
-         else
-         if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-           cmds=$archive_expsym_cmds
-         else
-           cmds=$archive_cmds
-           fi
-         fi
-
-         # Append the command to remove the reloadable object files
-         # to the just-reset $cmds.
-         eval cmds=\"\$cmds~\$rm $delfiles\"
-       fi
-       save_ifs="$IFS"; IFS='~'
-       for cmd in $cmds; do
-         IFS="$save_ifs"
-         eval cmd=\"$cmd\"
-         $show "$cmd"
-         $run eval "$cmd" || {
-           lt_exit=$?
-
-           # Restore the uninstalled library and exit
-           if test "$mode" = relink; then
-             $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-           fi
-
-           exit $lt_exit
-         }
-       done
-       IFS="$save_ifs"
-
-       # Restore the uninstalled library and exit
-       if test "$mode" = relink; then
-         $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-
-         if test -n "$convenience"; then
-           if test -z "$whole_archive_flag_spec"; then
-             $show "${rm}r $gentop"
-             $run ${rm}r "$gentop"
-           fi
-         fi
-
-         exit $EXIT_SUCCESS
-       fi
-
-       # Create links to the real library.
-       for linkname in $linknames; do
-         if test "$realname" != "$linkname"; then
-           $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
-           $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
-         fi
-       done
-
-       # If -module or -export-dynamic was specified, set the dlname.
-       if test "$module" = yes || test "$export_dynamic" = yes; then
-         # On all known operating systems, these are identical.
-         dlname="$soname"
-       fi
-      fi
-      ;;
-
-    obj)
-      if test -n "$deplibs"; then
-       $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-      fi
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-       $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-       $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-       $echo "$modename: warning: \`-R' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-       $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$release"; then
-       $echo "$modename: warning: \`-release' is ignored for objects" 1>&2
-      fi
-
-      case $output in
-      *.lo)
-       if test -n "$objs$old_deplibs"; then
-         $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-         exit $EXIT_FAILURE
-       fi
-       libobj="$output"
-       obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-       ;;
-      *)
-       libobj=
-       obj="$output"
-       ;;
-      esac
-
-      # Delete the old objects.
-      $run $rm $obj $libobj
-
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
-      wl=
-
-      if test -n "$convenience"; then
-       if test -n "$whole_archive_flag_spec"; then
-         eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
-       else
-         gentop="$output_objdir/${obj}x"
-         generated="$generated $gentop"
-
-         func_extract_archives $gentop $convenience
-         reload_conv_objs="$reload_objs $func_extract_archives_result"
-       fi
-      fi
-
-      # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-
-      output="$obj"
-      cmds=$reload_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-       IFS="$save_ifs"
-       eval cmd=\"$cmd\"
-       $show "$cmd"
-       $run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-       if test -n "$gentop"; then
-         $show "${rm}r $gentop"
-         $run ${rm}r $gentop
-       fi
-
-       exit $EXIT_SUCCESS
-      fi
-
-      if test "$build_libtool_libs" != yes; then
-       if test -n "$gentop"; then
-         $show "${rm}r $gentop"
-         $run ${rm}r $gentop
-       fi
-
-       # Create an invalid libtool object if no PIC, so that we don't
-       # accidentally link it into a program.
-       # $show "echo timestamp > $libobj"
-       # $run eval "echo timestamp > $libobj" || exit $?
-       exit $EXIT_SUCCESS
-      fi
-
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
-       # Only do commands if we really have different PIC objects.
-       reload_objs="$libobjs $reload_conv_objs"
-       output="$libobj"
-       cmds=$reload_cmds
-       save_ifs="$IFS"; IFS='~'
-       for cmd in $cmds; do
-         IFS="$save_ifs"
-         eval cmd=\"$cmd\"
-         $show "$cmd"
-         $run eval "$cmd" || exit $?
-       done
-       IFS="$save_ifs"
-      fi
-
-      if test -n "$gentop"; then
-       $show "${rm}r $gentop"
-       $run ${rm}r $gentop
-      fi
-
-      exit $EXIT_SUCCESS
-      ;;
-
-    prog)
-      case $host in
-       *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
-      esac
-      if test -n "$vinfo"; then
-       $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-      fi
-
-      if test -n "$release"; then
-       $echo "$modename: warning: \`-release' is ignored for programs" 1>&2
-      fi
-
-      if test "$preload" = yes; then
-       if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
-          test "$dlopen_self_static" = unknown; then
-         $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
-       fi
-      fi
-
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-       # On Rhapsody replace the C library is the System framework
-       compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-       finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-       ;;
-      esac
-
-      case $host in
-      *darwin*)
-        # Don't allow lazy linking, it breaks C++ global constructors
-        if test "$tagname" = CXX ; then
-        compile_command="$compile_command ${wl}-bind_at_load"
-        finalize_command="$finalize_command ${wl}-bind_at_load"
-        fi
-        ;;
-      esac
-
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-       case " $new_libs " in
-       *" -L$path/$objdir "*) ;;
-       *)
-         case " $compile_deplibs " in
-         *" -L$path/$objdir "*)
-           new_libs="$new_libs -L$path/$objdir" ;;
-         esac
-         ;;
-       esac
-      done
-      for deplib in $compile_deplibs; do
-       case $deplib in
-       -L*)
-         case " $new_libs " in
-         *" $deplib "*) ;;
-         *) new_libs="$new_libs $deplib" ;;
-         esac
-         ;;
-       *) new_libs="$new_libs $deplib" ;;
-       esac
-      done
-      compile_deplibs="$new_libs"
-
-
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
-
-      if test -n "$rpath$xrpath"; then
-       # If the user specified any rpath flags, then add them.
-       for libdir in $rpath $xrpath; do
-         # This is the magic to use -rpath.
-         case "$finalize_rpath " in
-         *" $libdir "*) ;;
-         *) finalize_rpath="$finalize_rpath $libdir" ;;
-         esac
-       done
-      fi
-
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-       if test -n "$hardcode_libdir_flag_spec"; then
-         if test -n "$hardcode_libdir_separator"; then
-           if test -z "$hardcode_libdirs"; then
-             hardcode_libdirs="$libdir"
-           else
-             # Just accumulate the unique libdirs.
-             case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-             *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-               ;;
-             *)
-               hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-               ;;
-             esac
-           fi
-         else
-           eval flag=\"$hardcode_libdir_flag_spec\"
-           rpath="$rpath $flag"
-         fi
-       elif test -n "$runpath_var"; then
-         case "$perm_rpath " in
-         *" $libdir "*) ;;
-         *) perm_rpath="$perm_rpath $libdir" ;;
-         esac
-       fi
-       case $host in
-       *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-         testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
-         case :$dllsearchpath: in
-         *":$libdir:"*) ;;
-         *) dllsearchpath="$dllsearchpath:$libdir";;
-         esac
-         case :$dllsearchpath: in
-         *":$testbindir:"*) ;;
-         *) dllsearchpath="$dllsearchpath:$testbindir";;
-         esac
-         ;;
-       esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-        test -n "$hardcode_libdirs"; then
-       libdir="$hardcode_libdirs"
-       eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath="$rpath"
-
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-       if test -n "$hardcode_libdir_flag_spec"; then
-         if test -n "$hardcode_libdir_separator"; then
-           if test -z "$hardcode_libdirs"; then
-             hardcode_libdirs="$libdir"
-           else
-             # Just accumulate the unique libdirs.
-             case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-             *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-               ;;
-             *)
-               hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-               ;;
-             esac
-           fi
-         else
-           eval flag=\"$hardcode_libdir_flag_spec\"
-           rpath="$rpath $flag"
-         fi
-       elif test -n "$runpath_var"; then
-         case "$finalize_perm_rpath " in
-         *" $libdir "*) ;;
-         *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-         esac
-       fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-        test -n "$hardcode_libdirs"; then
-       libdir="$hardcode_libdirs"
-       eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath="$rpath"
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-       # Transform all the library objects into standard objects.
-       compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-       finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-      fi
-
-      dlsyms=
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-       if test -n "$NM" && test -n "$global_symbol_pipe"; then
-         dlsyms="${outputname}S.c"
-       else
-         $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
-       fi
-      fi
-
-      if test -n "$dlsyms"; then
-       case $dlsyms in
-       "") ;;
-       *.c)
-         # Discover the nlist of each of the dlfiles.
-         nlist="$output_objdir/${outputname}.nm"
-
-         $show "$rm $nlist ${nlist}S ${nlist}T"
-         $run $rm "$nlist" "${nlist}S" "${nlist}T"
-
-         # Parse the name list into a source file.
-         $show "creating $output_objdir/$dlsyms"
-
-         test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
-/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
-/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-/* Prevent the only kind of declaration conflicts we can make. */
-#define lt_preloaded_symbols some_other_symbol
-
-/* External symbol declarations for the compiler. */\
-"
-
-         if test "$dlself" = yes; then
-           $show "generating symbol list for \`$output'"
-
-           test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
-
-           # Add our own program objects to the symbol list.
-           progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-           for arg in $progfiles; do
-             $show "extracting global C symbols from \`$arg'"
-             $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-           done
-
-           if test -n "$exclude_expsyms"; then
-             $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-             $run eval '$mv "$nlist"T "$nlist"'
-           fi
-
-           if test -n "$export_symbols_regex"; then
-             $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-             $run eval '$mv "$nlist"T "$nlist"'
-           fi
-
-           # Prepare the list of exported symbols
-           if test -z "$export_symbols"; then
-             export_symbols="$output_objdir/$outputname.exp"
-             $run $rm $export_symbols
-             $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-              case $host in
-              *cygwin* | *mingw* )
-               $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-               $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-                ;;
-              esac
-           else
-             $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-             $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-             $run eval 'mv "$nlist"T "$nlist"'
-              case $host in
-              *cygwin* | *mingw* )
-               $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-               $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-                ;;
-              esac
-           fi
-         fi
-
-         for arg in $dlprefiles; do
-           $show "extracting global C symbols from \`$arg'"
-           name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
-           $run eval '$echo ": $name " >> "$nlist"'
-           $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-         done
-
-         if test -z "$run"; then
-           # Make sure we have at least an empty file.
-           test -f "$nlist" || : > "$nlist"
-
-           if test -n "$exclude_expsyms"; then
-             $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-             $mv "$nlist"T "$nlist"
-           fi
-
-           # Try sorting and uniquifying the output.
-           if grep -v "^: " < "$nlist" |
-               if sort -k 3 </dev/null >/dev/null 2>&1; then
-                 sort -k 3
-               else
-                 sort +2
-               fi |
-               uniq > "$nlist"S; then
-             :
-           else
-             grep -v "^: " < "$nlist" > "$nlist"S
-           fi
-
-           if test -f "$nlist"S; then
-             eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
-           else
-             $echo '/* NONE */' >> "$output_objdir/$dlsyms"
-           fi
-
-           $echo >> "$output_objdir/$dlsyms" "\
-
-#undef lt_preloaded_symbols
-
-#if defined (__STDC__) && __STDC__
-# define lt_ptr void *
-#else
-# define lt_ptr char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-"
-
-           case $host in
-           *cygwin* | *mingw* )
-         $echo >> "$output_objdir/$dlsyms" "\
-/* DATA imports from DLLs on WIN32 can't be const, because
-   runtime relocations are performed -- see ld's documentation
-   on pseudo-relocs */
-struct {
-"
-             ;;
-           * )
-         $echo >> "$output_objdir/$dlsyms" "\
-const struct {
-"
-             ;;
-           esac
-
-
-         $echo >> "$output_objdir/$dlsyms" "\
-  const char *name;
-  lt_ptr address;
-}
-lt_preloaded_symbols[] =
-{\
-"
-
-           eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
-
-           $echo >> "$output_objdir/$dlsyms" "\
-  {0, (lt_ptr) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-         fi
-
-         pic_flag_for_symtable=
-         case $host in
-         # compiling the symbol table file with pic_flag works around
-         # a FreeBSD bug that causes programs to crash when -lm is
-         # linked before any other PIC object.  But we must not use
-         # pic_flag when linking with -static.  The problem exists in
-         # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-         *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-           case "$compile_command " in
-           *" -static "*) ;;
-           *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
-           esac;;
-         *-*-hpux*)
-           case "$compile_command " in
-           *" -static "*) ;;
-           *) pic_flag_for_symtable=" $pic_flag";;
-           esac
-         esac
-
-         # Now compile the dynamic symbol file.
-         $show "(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-         $run eval '(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-
-         # Clean up the generated files.
-         $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
-         $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
-
-         # Transform the symbol file into the correct name.
-          case $host in
-          *cygwin* | *mingw* )
-            if test -f "$output_objdir/${outputname}.def" ; then
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-            else
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-             fi
-            ;;
-          * )
-            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-            ;;
-          esac
-         ;;
-       *)
-         $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-         exit $EXIT_FAILURE
-         ;;
-       esac
-      else
-       # We keep going just in case the user didn't refer to
-       # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-       # really was required.
-
-       # Nullify the symbol file.
-       compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-       finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-      fi
-
-      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-       # Replace the output file specification.
-       compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-       link_command="$compile_command$compile_rpath"
-
-       # We have no uninstalled library dependencies, so finalize right now.
-       $show "$link_command"
-       $run eval "$link_command"
-       exit_status=$?
-
-       # Delete the generated files.
-       if test -n "$dlsyms"; then
-         $show "$rm $output_objdir/${outputname}S.${objext}"
-         $run $rm "$output_objdir/${outputname}S.${objext}"
-       fi
-
-       exit $exit_status
-      fi
-
-      if test -n "$shlibpath_var"; then
-       # We should set the shlibpath_var
-       rpath=
-       for dir in $temp_rpath; do
-         case $dir in
-         [\\/]* | [A-Za-z]:[\\/]*)
-           # Absolute path.
-           rpath="$rpath$dir:"
-           ;;
-         *)
-           # Relative path: add a thisdir entry.
-           rpath="$rpath\$thisdir/$dir:"
-           ;;
-         esac
-       done
-       temp_rpath="$rpath"
-      fi
-
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-       compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-       finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-       if test -n "$perm_rpath"; then
-         # We should set the runpath_var.
-         rpath=
-         for dir in $perm_rpath; do
-           rpath="$rpath$dir:"
-         done
-         compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-       fi
-       if test -n "$finalize_perm_rpath"; then
-         # We should set the runpath_var.
-         rpath=
-         for dir in $finalize_perm_rpath; do
-           rpath="$rpath$dir:"
-         done
-         finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-       fi
-      fi
-
-      if test "$no_install" = yes; then
-       # We don't need to create a wrapper script.
-       link_command="$compile_var$compile_command$compile_rpath"
-       # Replace the output file specification.
-       link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-       # Delete the old output file.
-       $run $rm $output
-       # Link the executable and exit
-       $show "$link_command"
-       $run eval "$link_command" || exit $?
-       exit $EXIT_SUCCESS
-      fi
-
-      if test "$hardcode_action" = relink; then
-       # Fast installation is not supported
-       link_command="$compile_var$compile_command$compile_rpath"
-       relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-       $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
-       $echo "$modename: \`$output' will be relinked during installation" 1>&2
-      else
-       if test "$fast_install" != no; then
-         link_command="$finalize_var$compile_command$finalize_rpath"
-         if test "$fast_install" = yes; then
-           relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-         else
-           # fast_install is set to needless
-           relink_command=
-         fi
-       else
-         link_command="$compile_var$compile_command$compile_rpath"
-         relink_command="$finalize_var$finalize_command$finalize_rpath"
-       fi
-      fi
-
-      # Replace the output file specification.
-      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
-      # Delete the old output files.
-      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
-      $show "$link_command"
-      $run eval "$link_command" || exit $?
-
-      # Now create the wrapper script.
-      $show "creating $output"
-
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-       # Preserve any variables that may affect compiler behavior
-       for var in $variables_saved_for_relink; do
-         if eval test -z \"\${$var+set}\"; then
-           relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-         elif eval var_value=\$$var; test -z "$var_value"; then
-           relink_command="$var=; export $var; $relink_command"
-         else
-           var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-           relink_command="$var=\"$var_value\"; export $var; $relink_command"
-         fi
-       done
-       relink_command="(cd `pwd`; $relink_command)"
-       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Quote $echo for shipping.
-      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
-       case $progpath in
-       [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-       *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
-       esac
-       qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
-      else
-       qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if our run command is non-null.
-      if test -z "$run"; then
-       # win32 will think the script is a binary if it has
-       # a .exe suffix, so we strip it off here.
-       case $output in
-         *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
-       esac
-       # test for cygwin because mv fails w/o .exe extensions
-       case $host in
-         *cygwin*)
-           exeext=.exe
-           outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
-         *) exeext= ;;
-       esac
-       case $host in
-         *cygwin* | *mingw* )
-            output_name=`basename $output`
-            output_path=`dirname $output`
-            cwrappersource="$output_path/$objdir/lt-$output_name.c"
-            cwrapper="$output_path/$output_name.exe"
-            $rm $cwrappersource $cwrapper
-            trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
-           cat > $cwrappersource <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
-
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
-
-   Currently, it simply execs the wrapper *script* "/bin/sh $output",
-   but could eventually absorb all of the scripts functionality and
-   exec $objdir/$outputname directly.
-*/
-EOF
-           cat >> $cwrappersource<<"EOF"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include <sys/stat.h>
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef DIR_SEPARATOR
-# define DIR_SEPARATOR '/'
-# define PATH_SEPARATOR ':'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
-# define HAVE_DOS_BASED_FILE_SYSTEM
-# ifndef DIR_SEPARATOR_2
-#  define DIR_SEPARATOR_2 '\\'
-# endif
-# ifndef PATH_SEPARATOR_2
-#  define PATH_SEPARATOR_2 ';'
-# endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#ifndef PATH_SEPARATOR_2
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
-#else /* PATH_SEPARATOR_2 */
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
-#endif /* PATH_SEPARATOR_2 */
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-/* -DDEBUG is fairly common in CFLAGS.  */
-#undef DEBUG
-#if defined DEBUGWRAPPER
-# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
-#else
-# define DEBUG(format, ...)
-#endif
-
-const char *program_name = NULL;
-
-void * xmalloc (size_t num);
-char * xstrdup (const char *string);
-const char * base_name (const char *name);
-char * find_executable(const char *wrapper);
-int    check_executable(const char *path);
-char * strendzap(char *str, const char *pat);
-void lt_fatal (const char *message, ...);
-
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  int i;
-
-  program_name = (char *) xstrdup (base_name (argv[0]));
-  DEBUG("(main) argv[0]      : %s\n",argv[0]);
-  DEBUG("(main) program_name : %s\n",program_name);
-  newargz = XMALLOC(char *, argc+2);
-EOF
-
-            cat >> $cwrappersource <<EOF
-  newargz[0] = (char *) xstrdup("$SHELL");
-EOF
-
-            cat >> $cwrappersource <<"EOF"
-  newargz[1] = find_executable(argv[0]);
-  if (newargz[1] == NULL)
-    lt_fatal("Couldn't find %s", argv[0]);
-  DEBUG("(main) found exe at : %s\n",newargz[1]);
-  /* we know the script has the same name, without the .exe */
-  /* so make sure newargz[1] doesn't end in .exe */
-  strendzap(newargz[1],".exe");
-  for (i = 1; i < argc; i++)
-    newargz[i+1] = xstrdup(argv[i]);
-  newargz[argc+1] = NULL;
-
-  for (i=0; i<argc+1; i++)
-  {
-    DEBUG("(main) newargz[%d]   : %s\n",i,newargz[i]);
-    ;
-  }
-
-EOF
-
-            case $host_os in
-              mingw*)
-                cat >> $cwrappersource <<EOF
-  execv("$SHELL",(char const **)newargz);
-EOF
-              ;;
-              *)
-                cat >> $cwrappersource <<EOF
-  execv("$SHELL",newargz);
-EOF
-              ;;
-            esac
-
-            cat >> $cwrappersource <<"EOF"
-  return 127;
-}
-
-void *
-xmalloc (size_t num)
-{
-  void * p = (void *) malloc (num);
-  if (!p)
-    lt_fatal ("Memory exhausted");
-
-  return p;
-}
-
-char *
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
-;
-}
-
-const char *
-base_name (const char *name)
-{
-  const char *base;
-
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha ((unsigned char)name[0]) && name[1] == ':')
-    name += 2;
-#endif
-
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return base;
-}
-
-int
-check_executable(const char * path)
-{
-  struct stat st;
-
-  DEBUG("(check_executable)  : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
-  if ((!path) || (!*path))
-    return 0;
-
-  if ((stat (path, &st) >= 0) &&
-      (
-        /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
-#if defined (S_IXOTH)
-       ((st.st_mode & S_IXOTH) == S_IXOTH) ||
-#endif
-#if defined (S_IXGRP)
-       ((st.st_mode & S_IXGRP) == S_IXGRP) ||
-#endif
-       ((st.st_mode & S_IXUSR) == S_IXUSR))
-      )
-    return 1;
-  else
-    return 0;
-}
-
-/* Searches for the full path of the wrapper.  Returns
-   newly allocated full path name if found, NULL otherwise */
-char *
-find_executable (const char* wrapper)
-{
-  int has_slash = 0;
-  const char* p;
-  const char* p_next;
-  /* static buffer for getcwd */
-  char tmp[LT_PATHMAX + 1];
-  int tmp_len;
-  char* concat_name;
-
-  DEBUG("(find_executable)  : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
-
-  if ((wrapper == NULL) || (*wrapper == '\0'))
-    return NULL;
-
-  /* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
-  {
-    concat_name = xstrdup (wrapper);
-    if (check_executable(concat_name))
-      return concat_name;
-    XFREE(concat_name);
-  }
-  else
-  {
-#endif
-    if (IS_DIR_SEPARATOR (wrapper[0]))
-    {
-      concat_name = xstrdup (wrapper);
-      if (check_executable(concat_name))
-        return concat_name;
-      XFREE(concat_name);
-    }
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  }
-#endif
-
-  for (p = wrapper; *p; p++)
-    if (*p == '/')
-    {
-      has_slash = 1;
-      break;
-    }
-  if (!has_slash)
-  {
-    /* no slashes; search PATH */
-    const char* path = getenv ("PATH");
-    if (path != NULL)
-    {
-      for (p = path; *p; p = p_next)
-      {
-        const char* q;
-        size_t p_len;
-        for (q = p; *q; q++)
-          if (IS_PATH_SEPARATOR(*q))
-            break;
-        p_len = q - p;
-        p_next = (*q == '\0' ? q : q + 1);
-        if (p_len == 0)
-        {
-          /* empty path: current directory */
-          if (getcwd (tmp, LT_PATHMAX) == NULL)
-            lt_fatal ("getcwd failed");
-          tmp_len = strlen(tmp);
-          concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
-          memcpy (concat_name, tmp, tmp_len);
-          concat_name[tmp_len] = '/';
-          strcpy (concat_name + tmp_len + 1, wrapper);
-        }
-        else
-        {
-          concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
-          memcpy (concat_name, p, p_len);
-          concat_name[p_len] = '/';
-          strcpy (concat_name + p_len + 1, wrapper);
-        }
-        if (check_executable(concat_name))
-          return concat_name;
-        XFREE(concat_name);
-      }
-    }
-    /* not found in PATH; assume curdir */
-  }
-  /* Relative path | not found in path: prepend cwd */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal ("getcwd failed");
-  tmp_len = strlen(tmp);
-  concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
-  memcpy (concat_name, tmp, tmp_len);
-  concat_name[tmp_len] = '/';
-  strcpy (concat_name + tmp_len + 1, wrapper);
-
-  if (check_executable(concat_name))
-    return concat_name;
-  XFREE(concat_name);
-  return NULL;
-}
-
-char *
-strendzap(char *str, const char *pat)
-{
-  size_t len, patlen;
-
-  assert(str != NULL);
-  assert(pat != NULL);
-
-  len = strlen(str);
-  patlen = strlen(pat);
-
-  if (patlen <= len)
-  {
-    str += len - patlen;
-    if (strcmp(str, pat) == 0)
-      *str = '\0';
-  }
-  return str;
-}
-
-static void
-lt_error_core (int exit_status, const char * mode,
-          const char * message, va_list ap)
-{
-  fprintf (stderr, "%s: %s: ", program_name, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-  va_end (ap);
-}
-EOF
-          # we should really use a build-platform specific compiler
-          # here, but OTOH, the wrappers (shell script and this C one)
-          # are only useful if you want to execute the "real" binary.
-          # Since the "real" binary is built for $host, then this
-          # wrapper might as well be built for $host, too.
-          $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
-          ;;
-        esac
-        $rm $output
-        trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
-
-       $echo > $output "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
-sed_quote_subst='$sed_quote_subst'
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variable:
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$echo are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    echo=\"$qecho\"
-    file=\"\$0\"
-    # Make sure echo works.
-    if test \"X\$1\" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
-      # Yippee, \$echo works!
-      :
-    else
-      # Restart under the correct shell, and then maybe \$echo will work.
-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-    fi
-  fi\
-"
-       $echo >> $output "\
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-  done
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-       if test "$fast_install" = yes; then
-         $echo >> $output "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" || \\
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $mkdir \"\$progdir\"
-    else
-      $rm \"\$progdir/\$file\"
-    fi"
-
-         $echo >> $output "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-       $echo \"\$relink_command_output\" >&2
-       $rm \"\$progdir/\$file\"
-       exit $EXIT_FAILURE
-      fi
-    fi
-
-    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $rm \"\$progdir/\$program\";
-      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $rm \"\$progdir/\$file\"
-  fi"
-       else
-         $echo >> $output "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-       fi
-
-       $echo >> $output "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-       # Export our shlibpath_var if we have one.
-       if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-         $echo >> $output "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-       fi
-
-       # fixup the dll searchpath if we need to.
-       if test -n "$dllsearchpath"; then
-         $echo >> $output "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-       fi
-
-       $echo >> $output "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-"
-       case $host in
-       # Backslashes separate directories on plain windows
-       *-*-mingw | *-*-os2*)
-         $echo >> $output "\
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-         ;;
-
-       *)
-         $echo >> $output "\
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-         ;;
-       esac
-       $echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-      exit $EXIT_FAILURE
-    fi
-  else
-    # The program doesn't exist.
-    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-    \$echo \"This script is just a wrapper for \$program.\" 1>&2
-    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit $EXIT_FAILURE
-  fi
-fi\
-"
-       chmod +x $output
-      fi
-      exit $EXIT_SUCCESS
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
-
-      if test "$build_libtool_libs" = convenience; then
-       oldobjs="$libobjs_save"
-       addlibs="$convenience"
-       build_libtool_libs=no
-      else
-       if test "$build_libtool_libs" = module; then
-         oldobjs="$libobjs_save"
-         build_libtool_libs=no
-       else
-         oldobjs="$old_deplibs $non_pic_objects"
-       fi
-       addlibs="$old_convenience"
-      fi
-
-      if test -n "$addlibs"; then
-       gentop="$output_objdir/${outputname}x"
-       generated="$generated $gentop"
-
-       func_extract_archives $gentop $addlibs
-       oldobjs="$oldobjs $func_extract_archives_result"
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-       cmds=$old_archive_from_new_cmds
-      else
-       # POSIX demands no paths to be encoded in archives.  We have
-       # to avoid creating archives with duplicate basenames if we
-       # might have to extract them afterwards, e.g., when creating a
-       # static archive out of a convenience library, or when linking
-       # the entirety of a libtool archive into another (currently
-       # not supported by libtool).
-       if (for obj in $oldobjs
-           do
-             $echo "X$obj" | $Xsed -e 's%^.*/%%'
-           done | sort | sort -uc >/dev/null 2>&1); then
-         :
-       else
-         $echo "copying selected object files to avoid basename conflicts..."
-
-         if test -z "$gentop"; then
-           gentop="$output_objdir/${outputname}x"
-           generated="$generated $gentop"
-
-           $show "${rm}r $gentop"
-           $run ${rm}r "$gentop"
-           $show "$mkdir $gentop"
-           $run $mkdir "$gentop"
-           exit_status=$?
-           if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
-             exit $exit_status
-           fi
-         fi
-
-         save_oldobjs=$oldobjs
-         oldobjs=
-         counter=1
-         for obj in $save_oldobjs
-         do
-           objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-           case " $oldobjs " in
-           " ") oldobjs=$obj ;;
-           *[\ /]"$objbase "*)
-             while :; do
-               # Make sure we don't pick an alternate name that also
-               # overlaps.
-               newobj=lt$counter-$objbase
-               counter=`expr $counter + 1`
-               case " $oldobjs " in
-               *[\ /]"$newobj "*) ;;
-               *) if test ! -f "$gentop/$newobj"; then break; fi ;;
-               esac
-             done
-             $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-             $run ln "$obj" "$gentop/$newobj" ||
-             $run cp "$obj" "$gentop/$newobj"
-             oldobjs="$oldobjs $gentop/$newobj"
-             ;;
-           *) oldobjs="$oldobjs $obj" ;;
-           esac
-         done
-       fi
-
-       eval cmds=\"$old_archive_cmds\"
-
-       if len=`expr "X$cmds" : ".*"` &&
-            test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-         cmds=$old_archive_cmds
-       else
-         # the command line is too long to link in one step, link in parts
-         $echo "using piecewise archive linking..."
-         save_RANLIB=$RANLIB
-         RANLIB=:
-         objlist=
-         concat_cmds=
-         save_oldobjs=$oldobjs
-
-         # Is there a better way of finding the last object in the list?
-         for obj in $save_oldobjs
-         do
-           last_oldobj=$obj
-         done
-         for obj in $save_oldobjs
-         do
-           oldobjs="$objlist $obj"
-           objlist="$objlist $obj"
-           eval test_cmds=\"$old_archive_cmds\"
-           if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-              test "$len" -le "$max_cmd_len"; then
-             :
-           else
-             # the above command should be used before it gets too long
-             oldobjs=$objlist
-             if test "$obj" = "$last_oldobj" ; then
-               RANLIB=$save_RANLIB
-             fi
-             test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-             eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-             objlist=
-           fi
-         done
-         RANLIB=$save_RANLIB
-         oldobjs=$objlist
-         if test "X$oldobjs" = "X" ; then
-           eval cmds=\"\$concat_cmds\"
-         else
-           eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-         fi
-       fi
-      fi
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-        eval cmd=\"$cmd\"
-       IFS="$save_ifs"
-       $show "$cmd"
-       $run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$generated"; then
-      $show "${rm}r$generated"
-      $run ${rm}r$generated
-    fi
-
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
-      $show "creating $output"
-
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-       if eval test -z \"\${$var+set}\"; then
-         relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-       elif eval var_value=\$$var; test -z "$var_value"; then
-         relink_command="$var=; export $var; $relink_command"
-       else
-         var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-         relink_command="$var=\"$var_value\"; export $var; $relink_command"
-       fi
-      done
-      # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      if test "$hardcode_automatic" = yes ; then
-       relink_command=
-      fi
-
-
-      # Only create the output if not a dry run.
-      if test -z "$run"; then
-       for installed in no yes; do
-         if test "$installed" = yes; then
-           if test -z "$install_libdir"; then
-             break
-           fi
-           output="$output_objdir/$outputname"i
-           # Replace all uninstalled libtool libraries with the installed ones
-           newdependency_libs=
-           for deplib in $dependency_libs; do
-             case $deplib in
-             *.la)
-               name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-               eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-               if test -z "$libdir"; then
-                 $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-                 exit $EXIT_FAILURE
-               fi
-               newdependency_libs="$newdependency_libs $libdir/$name"
-               ;;
-             *) newdependency_libs="$newdependency_libs $deplib" ;;
-             esac
-           done
-           dependency_libs="$newdependency_libs"
-           newdlfiles=
-           for lib in $dlfiles; do
-             name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-             eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-             if test -z "$libdir"; then
-               $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-               exit $EXIT_FAILURE
-             fi
-             newdlfiles="$newdlfiles $libdir/$name"
-           done
-           dlfiles="$newdlfiles"
-           newdlprefiles=
-           for lib in $dlprefiles; do
-             name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-             eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-             if test -z "$libdir"; then
-               $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-               exit $EXIT_FAILURE
-             fi
-             newdlprefiles="$newdlprefiles $libdir/$name"
-           done
-           dlprefiles="$newdlprefiles"
-         else
-           newdlfiles=
-           for lib in $dlfiles; do
-             case $lib in
-               [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-               *) abs=`pwd`"/$lib" ;;
-             esac
-             newdlfiles="$newdlfiles $abs"
-           done
-           dlfiles="$newdlfiles"
-           newdlprefiles=
-           for lib in $dlprefiles; do
-             case $lib in
-               [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-               *) abs=`pwd`"/$lib" ;;
-             esac
-             newdlprefiles="$newdlprefiles $abs"
-           done
-           dlprefiles="$newdlprefiles"
-         fi
-         $rm $output
-         # place dlname in correct position for cygwin
-         tdlname=$dlname
-         case $host,$output,$installed,$module,$dlname in
-           *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-         esac
-         $echo > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=$installed
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-         if test "$installed" = no && test "$need_relink" = yes; then
-           $echo >> $output "\
-relink_command=\"$relink_command\""
-         fi
-       done
-      fi
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
-      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
-      ;;
-    esac
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool install mode
-  install)
-    modename="$modename: install"
-
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       $echo "X$nonopt" | grep shtool > /dev/null; then
-      # Aesthetically quote it.
-      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \    ]*|*]*|"")
-       arg="\"$arg\""
-       ;;
-      esac
-      install_prog="$arg "
-      arg="$1"
-      shift
-    else
-      install_prog=
-      arg=$nonopt
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-    case $arg in
-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \      ]*|*]*|"")
-      arg="\"$arg\""
-      ;;
-    esac
-    install_prog="$install_prog$arg"
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    for arg
-    do
-      if test -n "$dest"; then
-       files="$files $dest"
-       dest=$arg
-       continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f) 
-       case " $install_prog " in
-       *[\\\ /]cp\ *) ;;
-       *) prev=$arg ;;
-       esac
-       ;;
-      -g | -m | -o) prev=$arg ;;
-      -s)
-       stripme=" -s"
-       continue
-       ;;
-      -*)
-       ;;
-      *)
-       # If the previous option needed an argument, then skip it.
-       if test -n "$prev"; then
-         prev=
-       else
-         dest=$arg
-         continue
-       fi
-       ;;
-      esac
-
-      # Aesthetically quote the argument.
-      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \    ]*|*]*|"")
-       arg="\"$arg\""
-       ;;
-      esac
-      install_prog="$install_prog $arg"
-    done
-
-    if test -z "$install_prog"; then
-      $echo "$modename: you must specify an install program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prev' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-       $echo "$modename: no file or destination specified" 1>&2
-      else
-       $echo "$modename: you must specify a destination" 1>&2
-      fi
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Strip any trailing slash from the destination.
-    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
-      test "X$destdir" = "X$dest" && destdir=.
-      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files
-      if test "$#" -gt 2; then
-       $echo "$modename: \`$dest' is not a directory" 1>&2
-       $echo "$help" 1>&2
-       exit $EXIT_FAILURE
-      fi
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-       case $file in
-       *.lo) ;;
-       *)
-         $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
-         $echo "$help" 1>&2
-         exit $EXIT_FAILURE
-         ;;
-       esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-       # Do the static libraries later.
-       staticlibs="$staticlibs $file"
-       ;;
-
-      *.la)
-       # Check to see that this really is a libtool archive.
-       if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-       else
-         $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-         $echo "$help" 1>&2
-         exit $EXIT_FAILURE
-       fi
-
-       library_names=
-       old_library=
-       relink_command=
-       # If there is no directory component, then add one.
-       case $file in
-       */* | *\\*) . $file ;;
-       *) . ./$file ;;
-       esac
-
-       # Add the libdir to current_libdirs if it is the destination.
-       if test "X$destdir" = "X$libdir"; then
-         case "$current_libdirs " in
-         *" $libdir "*) ;;
-         *) current_libdirs="$current_libdirs $libdir" ;;
-         esac
-       else
-         # Note the libdir as a future libdir.
-         case "$future_libdirs " in
-         *" $libdir "*) ;;
-         *) future_libdirs="$future_libdirs $libdir" ;;
-         esac
-       fi
-
-       dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
-       test "X$dir" = "X$file/" && dir=
-       dir="$dir$objdir"
-
-       if test -n "$relink_command"; then
-         # Determine the prefix the user has applied to our future dir.
-         inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
-
-         # Don't allow the user to place us outside of our expected
-         # location b/c this prevents finding dependent libraries that
-         # are installed to the same prefix.
-         # At present, this check doesn't affect windows .dll's that
-         # are installed into $libdir/../bin (currently, that works fine)
-         # but it's something to keep an eye on.
-         if test "$inst_prefix_dir" = "$destdir"; then
-           $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-           exit $EXIT_FAILURE
-         fi
-
-         if test -n "$inst_prefix_dir"; then
-           # Stick the inst_prefix_dir data into the link command.
-           relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-         else
-           relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-         fi
-
-         $echo "$modename: warning: relinking \`$file'" 1>&2
-         $show "$relink_command"
-         if $run eval "$relink_command"; then :
-         else
-           $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-           exit $EXIT_FAILURE
-         fi
-       fi
-
-       # See the names of the shared library.
-       set dummy $library_names
-       if test -n "$2"; then
-         realname="$2"
-         shift
-         shift
-
-         srcname="$realname"
-         test -n "$relink_command" && srcname="$realname"T
-
-         # Install the shared library and build the symlinks.
-         $show "$install_prog $dir/$srcname $destdir/$realname"
-         $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
-         if test -n "$stripme" && test -n "$striplib"; then
-           $show "$striplib $destdir/$realname"
-           $run eval "$striplib $destdir/$realname" || exit $?
-         fi
-
-         if test "$#" -gt 0; then
-           # Delete the old symlinks, and create new ones.
-           # Try `ln -sf' first, because the `ln' binary might depend on
-           # the symlink we replace!  Solaris /bin/ln does not understand -f,
-           # so we also need to try rm && ln -s.
-           for linkname
-           do
-             if test "$linkname" != "$realname"; then
-                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-             fi
-           done
-         fi
-
-         # Do each command in the postinstall commands.
-         lib="$destdir/$realname"
-         cmds=$postinstall_cmds
-         save_ifs="$IFS"; IFS='~'
-         for cmd in $cmds; do
-           IFS="$save_ifs"
-           eval cmd=\"$cmd\"
-           $show "$cmd"
-           $run eval "$cmd" || {
-             lt_exit=$?
-
-             # Restore the uninstalled library and exit
-             if test "$mode" = relink; then
-               $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-             fi
-
-             exit $lt_exit
-           }
-         done
-         IFS="$save_ifs"
-       fi
-
-       # Install the pseudo-library for information purposes.
-       name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-       instname="$dir/$name"i
-       $show "$install_prog $instname $destdir/$name"
-       $run eval "$install_prog $instname $destdir/$name" || exit $?
-
-       # Maybe install the static library, too.
-       test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-       ;;
-
-      *.lo)
-       # Install (i.e. copy) a libtool object.
-
-       # Figure out destination file name, if it wasn't already specified.
-       if test -n "$destname"; then
-         destfile="$destdir/$destname"
-       else
-         destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-         destfile="$destdir/$destfile"
-       fi
-
-       # Deduce the name of the destination old-style object file.
-       case $destfile in
-       *.lo)
-         staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
-         ;;
-       *.$objext)
-         staticdest="$destfile"
-         destfile=
-         ;;
-       *)
-         $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
-         $echo "$help" 1>&2
-         exit $EXIT_FAILURE
-         ;;
-       esac
-
-       # Install the libtool object if requested.
-       if test -n "$destfile"; then
-         $show "$install_prog $file $destfile"
-         $run eval "$install_prog $file $destfile" || exit $?
-       fi
-
-       # Install the old object if enabled.
-       if test "$build_old_libs" = yes; then
-         # Deduce the name of the old-style object file.
-         staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
-
-         $show "$install_prog $staticobj $staticdest"
-         $run eval "$install_prog \$staticobj \$staticdest" || exit $?
-       fi
-       exit $EXIT_SUCCESS
-       ;;
-
-      *)
-       # Figure out destination file name, if it wasn't already specified.
-       if test -n "$destname"; then
-         destfile="$destdir/$destname"
-       else
-         destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-         destfile="$destdir/$destfile"
-       fi
-
-       # If the file is missing, and there is a .exe on the end, strip it
-       # because it is most likely a libtool script we actually want to
-       # install
-       stripped_ext=""
-       case $file in
-         *.exe)
-           if test ! -f "$file"; then
-             file=`$echo $file|${SED} 's,.exe$,,'`
-             stripped_ext=".exe"
-           fi
-           ;;
-       esac
-
-       # Do a test to see if this is really a libtool program.
-       case $host in
-       *cygwin*|*mingw*)
-           wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
-           ;;
-       *)
-           wrapper=$file
-           ;;
-       esac
-       if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
-         notinst_deplibs=
-         relink_command=
-
-         # Note that it is not necessary on cygwin/mingw to append a dot to
-         # foo even if both foo and FILE.exe exist: automatic-append-.exe
-         # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-         # `FILE.' does not work on cygwin managed mounts.
-         #
-         # If there is no directory component, then add one.
-         case $wrapper in
-         */* | *\\*) . ${wrapper} ;;
-         *) . ./${wrapper} ;;
-         esac
-
-         # Check the variables that should have been set.
-         if test -z "$notinst_deplibs"; then
-           $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
-           exit $EXIT_FAILURE
-         fi
-
-         finalize=yes
-         for lib in $notinst_deplibs; do
-           # Check to see that each library is installed.
-           libdir=
-           if test -f "$lib"; then
-             # If there is no directory component, then add one.
-             case $lib in
-             */* | *\\*) . $lib ;;
-             *) . ./$lib ;;
-             esac
-           fi
-           libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-           if test -n "$libdir" && test ! -f "$libfile"; then
-             $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
-             finalize=no
-           fi
-         done
-
-         relink_command=
-         # Note that it is not necessary on cygwin/mingw to append a dot to
-         # foo even if both foo and FILE.exe exist: automatic-append-.exe
-         # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-         # `FILE.' does not work on cygwin managed mounts.
-         #
-         # If there is no directory component, then add one.
-         case $wrapper in
-         */* | *\\*) . ${wrapper} ;;
-         *) . ./${wrapper} ;;
-         esac
-
-         outputname=
-         if test "$fast_install" = no && test -n "$relink_command"; then
-           if test "$finalize" = yes && test -z "$run"; then
-             tmpdir=`func_mktempdir`
-             file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
-             outputname="$tmpdir/$file"
-             # Replace the output file specification.
-             relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-
-             $show "$relink_command"
-             if $run eval "$relink_command"; then :
-             else
-               $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-               ${rm}r "$tmpdir"
-               continue
-             fi
-             file="$outputname"
-           else
-             $echo "$modename: warning: cannot relink \`$file'" 1>&2
-           fi
-         else
-           # Install the binary that we compiled earlier.
-           file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-         fi
-       fi
-
-       # remove .exe since cygwin /usr/bin/install will append another
-       # one anyway 
-       case $install_prog,$host in
-       */usr/bin/install*,*cygwin*)
-         case $file:$destfile in
-         *.exe:*.exe)
-           # this is ok
-           ;;
-         *.exe:*)
-           destfile=$destfile.exe
-           ;;
-         *:*.exe)
-           destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
-           ;;
-         esac
-         ;;
-       esac
-       $show "$install_prog$stripme $file $destfile"
-       $run eval "$install_prog\$stripme \$file \$destfile" || exit $?
-       test -n "$outputname" && ${rm}r "$tmpdir"
-       ;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-
-      $show "$install_prog $file $oldlib"
-      $run eval "$install_prog \$file \$oldlib" || exit $?
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-       $show "$old_striplib $oldlib"
-       $run eval "$old_striplib $oldlib" || exit $?
-      fi
-
-      # Do each command in the postinstall commands.
-      cmds=$old_postinstall_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-       IFS="$save_ifs"
-       eval cmd=\"$cmd\"
-       $show "$cmd"
-       $run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$future_libdirs"; then
-      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
-    fi
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      test -n "$run" && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-    else
-      exit $EXIT_SUCCESS
-    fi
-    ;;
-
-  # libtool finish mode
-  finish)
-    modename="$modename: finish"
-    libdirs="$nonopt"
-    admincmds=
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-       libdirs="$libdirs $dir"
-      done
-
-      for libdir in $libdirs; do
-       if test -n "$finish_cmds"; then
-         # Do each command in the finish commands.
-         cmds=$finish_cmds
-         save_ifs="$IFS"; IFS='~'
-         for cmd in $cmds; do
-           IFS="$save_ifs"
-           eval cmd=\"$cmd\"
-           $show "$cmd"
-           $run eval "$cmd" || admincmds="$admincmds
-       $cmd"
-         done
-         IFS="$save_ifs"
-       fi
-       if test -n "$finish_eval"; then
-         # Do the single finish_eval.
-         eval cmds=\"$finish_eval\"
-         $run eval "$cmds" || admincmds="$admincmds
-       $cmds"
-       fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    test "$show" = : && exit $EXIT_SUCCESS
-
-    $echo "X----------------------------------------------------------------------" | $Xsed
-    $echo "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $echo "   $libdir"
-    done
-    $echo
-    $echo "If you ever happen to want to link against installed libraries"
-    $echo "in a given directory, LIBDIR, you must either use libtool, and"
-    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    $echo "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      $echo "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-      $echo "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
-
-      $echo "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $echo "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    $echo
-    $echo "See any operating system documentation about shared libraries for"
-    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    $echo "X----------------------------------------------------------------------" | $Xsed
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool execute mode
-  execute)
-    modename="$modename: execute"
-
-    # The first argument is the command name.
-    cmd="$nonopt"
-    if test -z "$cmd"; then
-      $echo "$modename: you must specify a COMMAND" 1>&2
-      $echo "$help"
-      exit $EXIT_FAILURE
-    fi
-
-    # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
-      if test ! -f "$file"; then
-       $echo "$modename: \`$file' is not a file" 1>&2
-       $echo "$help" 1>&2
-       exit $EXIT_FAILURE
-      fi
-
-      dir=
-      case $file in
-      *.la)
-       # Check to see that this really is a libtool archive.
-       if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-       else
-         $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-         $echo "$help" 1>&2
-         exit $EXIT_FAILURE
-       fi
-
-       # Read the libtool library.
-       dlname=
-       library_names=
-
-       # If there is no directory component, then add one.
-       case $file in
-       */* | *\\*) . $file ;;
-       *) . ./$file ;;
-       esac
-
-       # Skip this library if it cannot be dlopened.
-       if test -z "$dlname"; then
-         # Warn if it was a shared library.
-         test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
-         continue
-       fi
-
-       dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-       test "X$dir" = "X$file" && dir=.
-
-       if test -f "$dir/$objdir/$dlname"; then
-         dir="$dir/$objdir"
-       else
-         $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-         exit $EXIT_FAILURE
-       fi
-       ;;
-
-      *.lo)
-       # Just add the directory containing the .lo file.
-       dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-       test "X$dir" = "X$file" && dir=.
-       ;;
-
-      *)
-       $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
-       continue
-       ;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-       eval "$shlibpath_var=\"\$dir\""
-      else
-       eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -*) ;;
-      *)
-       # Do a test to see if this is really a libtool program.
-       if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-         # If there is no directory component, then add one.
-         case $file in
-         */* | *\\*) . $file ;;
-         *) . ./$file ;;
-         esac
-
-         # Transform arg to wrapped name.
-         file="$progdir/$program"
-       fi
-       ;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
-      args="$args \"$file\""
-    done
-
-    if test -z "$run"; then
-      if test -n "$shlibpath_var"; then
-       # Export the shlibpath_var.
-       eval "export $shlibpath_var"
-      fi
-
-      # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
-       LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-       LANG="$save_LANG"; export LANG
-      fi
-
-      # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-       eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
-       $echo "export $shlibpath_var"
-      fi
-      $echo "$cmd$args"
-      exit $EXIT_SUCCESS
-    fi
-    ;;
-
-  # libtool clean and uninstall mode
-  clean | uninstall)
-    modename="$modename: $mode"
-    rm="$nonopt"
-    files=
-    rmforce=
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -f) rm="$rm $arg"; rmforce=yes ;;
-      -*) rm="$rm $arg" ;;
-      *) files="$files $arg" ;;
-      esac
-    done
-
-    if test -z "$rm"; then
-      $echo "$modename: you must specify an RM program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    rmdirs=
-
-    origobjdir="$objdir"
-    for file in $files; do
-      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-      if test "X$dir" = "X$file"; then
-       dir=.
-       objdir="$origobjdir"
-      else
-       objdir="$dir/$origobjdir"
-      fi
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-      test "$mode" = uninstall && objdir="$dir"
-
-      # Remember objdir for removal later, being careful to avoid duplicates
-      if test "$mode" = clean; then
-       case " $rmdirs " in
-         *" $objdir "*) ;;
-         *) rmdirs="$rmdirs $objdir" ;;
-       esac
-      fi
-
-      # Don't error if the file doesn't exist and rm -f was used.
-      if (test -L "$file") >/dev/null 2>&1 \
-       || (test -h "$file") >/dev/null 2>&1 \
-       || test -f "$file"; then
-       :
-      elif test -d "$file"; then
-       exit_status=1
-       continue
-      elif test "$rmforce" = yes; then
-       continue
-      fi
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-       # Possibly a libtool archive, so verify it.
-       if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-         . $dir/$name
-
-         # Delete the libtool libraries and symlinks.
-         for n in $library_names; do
-           rmfiles="$rmfiles $objdir/$n"
-         done
-         test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-
-         case "$mode" in
-         clean)
-           case "  $library_names " in
-           # "  " in the beginning catches empty $dlname
-           *" $dlname "*) ;;
-           *) rmfiles="$rmfiles $objdir/$dlname" ;;
-           esac
-            test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-           ;;
-         uninstall)
-           if test -n "$library_names"; then
-             # Do each command in the postuninstall commands.
-             cmds=$postuninstall_cmds
-             save_ifs="$IFS"; IFS='~'
-             for cmd in $cmds; do
-               IFS="$save_ifs"
-               eval cmd=\"$cmd\"
-               $show "$cmd"
-               $run eval "$cmd"
-               if test "$?" -ne 0 && test "$rmforce" != yes; then
-                 exit_status=1
-               fi
-             done
-             IFS="$save_ifs"
-           fi
-
-           if test -n "$old_library"; then
-             # Do each command in the old_postuninstall commands.
-             cmds=$old_postuninstall_cmds
-             save_ifs="$IFS"; IFS='~'
-             for cmd in $cmds; do
-               IFS="$save_ifs"
-               eval cmd=\"$cmd\"
-               $show "$cmd"
-               $run eval "$cmd"
-               if test "$?" -ne 0 && test "$rmforce" != yes; then
-                 exit_status=1
-               fi
-             done
-             IFS="$save_ifs"
-           fi
-           # FIXME: should reinstall the best remaining shared library.
-           ;;
-         esac
-       fi
-       ;;
-
-      *.lo)
-       # Possibly a libtool object, so verify it.
-       if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-
-         # Read the .lo file
-         . $dir/$name
-
-         # Add PIC object to the list of files to remove.
-         if test -n "$pic_object" \
-            && test "$pic_object" != none; then
-           rmfiles="$rmfiles $dir/$pic_object"
-         fi
-
-         # Add non-PIC object to the list of files to remove.
-         if test -n "$non_pic_object" \
-            && test "$non_pic_object" != none; then
-           rmfiles="$rmfiles $dir/$non_pic_object"
-         fi
-       fi
-       ;;
-
-      *)
-       if test "$mode" = clean ; then
-         noexename=$name
-         case $file in
-         *.exe)
-           file=`$echo $file|${SED} 's,.exe$,,'`
-           noexename=`$echo $name|${SED} 's,.exe$,,'`
-           # $file with .exe has already been added to rmfiles,
-           # add $file without .exe
-           rmfiles="$rmfiles $file"
-           ;;
-         esac
-         # Do a test to see if this is a libtool program.
-         if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-           relink_command=
-           . $dir/$noexename
-
-           # note $name still contains .exe if it was in $file originally
-           # as does the version of $file that was added into $rmfiles
-           rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-           if test "$fast_install" = yes && test -n "$relink_command"; then
-             rmfiles="$rmfiles $objdir/lt-$name"
-           fi
-           if test "X$noexename" != "X$name" ; then
-             rmfiles="$rmfiles $objdir/lt-${noexename}.c"
-           fi
-         fi
-       fi
-       ;;
-      esac
-      $show "$rm $rmfiles"
-      $run $rm $rmfiles || exit_status=1
-    done
-    objdir="$origobjdir"
-
-    # Try to remove the ${objdir}s in the directories where we deleted files
-    for dir in $rmdirs; do
-      if test -d "$dir"; then
-       $show "rmdir $dir"
-       $run rmdir $dir >/dev/null 2>&1
-      fi
-    done
-
-    exit $exit_status
-    ;;
-
-  "")
-    $echo "$modename: you must specify a MODE" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-    ;;
-  esac
-
-  if test -z "$exec_cmd"; then
-    $echo "$modename: invalid operation mode \`$mode'" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-fi # test -z "$show_help"
-
-if test -n "$exec_cmd"; then
-  eval exec $exec_cmd
-  exit $EXIT_FAILURE
-fi
-
-# We need to display help for each of the modes.
-case $mode in
-"") $echo \
-"Usage: $modename [OPTION]... [MODE-ARG]...
-
-Provide generalized library-building support services.
-
-    --config          show all configuration variables
-    --debug           enable verbose shell tracing
--n, --dry-run         display commands without modifying any files
-    --features        display basic configuration information and exit
-    --finish          same as \`--mode=finish'
-    --help            display this help message and exit
-    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
-    --quiet           same as \`--silent'
-    --silent          don't print informational messages
-    --tag=TAG         use configuration variables from tag TAG
-    --version         print version information
-
-MODE must be one of the following:
-
-      clean           remove files from the build directory
-      compile         compile a source file into a libtool object
-      execute         automatically set library path, then run a program
-      finish          complete the installation of libtool libraries
-      install         install libraries or executables
-      link            create a library or an executable
-      uninstall       remove libraries from an installed directory
-
-MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
-a more detailed description of MODE.
-
-Report bugs to <bug-libtool@gnu.org>."
-  exit $EXIT_SUCCESS
-  ;;
-
-clean)
-  $echo \
-"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-compile)
-  $echo \
-"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
-  -static           always build a \`.o' file suitable for static linking
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-  ;;
-
-execute)
-  $echo \
-"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-  ;;
-
-finish)
-  $echo \
-"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-  ;;
-
-install)
-  $echo \
-"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-  ;;
-
-link)
-  $echo \
-"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-                   try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-                   try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-                   specify library version info [each variable defaults to 0]
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-  ;;
-
-uninstall)
-  $echo \
-"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-*)
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-  ;;
-esac
-
-$echo
-$echo "Try \`$modename --help' for more information about other modes."
-
-exit $?
-
-# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them.  This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration.  But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-disable_libs=shared
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-disable_libs=static
-# ### END LIBTOOL TAG CONFIG: disable-static
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
diff --git a/experimental/modest/src/Makefile.am b/experimental/modest/src/Makefile.am
deleted file mode 100644 (file)
index 2ea852e..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Makefile.am
-# Time-stamp: <2006-04-26 16:39:54 (djcb)>
-SUBDIRS=gtk gtk-glade hildon
-
-#FIXME: make the gconf stuff conditional
-
-INCLUDES=\
-       $(MODEST_GSTUFF_CFLAGS)\
-       $(MODEST_GCONF_CFLAGS)\
-       $(MODEST_GTK_CFLAGS)\
-       $(MODEST_TINYMAIL_CFLAGS)
-
-bin_PROGRAMS=\
-       modest
-
-if MODEST_ENABLE_GCONF
-modest_SOURCES=\
-       modest-main.c\
-       modest-conf-keys.h\
-       modest-conf.h \
-       modest-conf-gconf.c\
-       modest-account-keys.h\
-       modest-account-mgr.h\
-       modest-account-mgr.c\
-       modest-window-mgr.h\
-       modest-window-mgr.c\
-       modest-tny-account-store.h\
-       modest-tny-account-store.c\
-       modest-tny-folder-tree-view.h\
-       modest-tny-folder-tree-view.c\
-       modest-tny-header-tree-view.h\
-       modest-tny-header-tree-view.c\
-       modest-tny-msg-view.h\
-       modest-tny-msg-view.c\
-       modest-ui.h
-else
-modest_SOURCES=\
-       modest-main.c\
-       modest-conf.h \
-       modest-conf-keys.h\
-       modest-account-keys.h\
-       modest-account-mgr.h\
-       modest-account-mgr.c\
-       modest-ui.h
-endif
-
-modest_LDADD = \
-       $(MODEST_GSTUFF_LIBS) \
-       $(MODEST_GCONF_LIBS) \
-       $(MODEST_GTK_LIBS)\
-       $(MODEST_TINYMAIL_LIBS)\
-       $(MODEST_UI_DIR)/libmodest-ui.la 
diff --git a/experimental/modest/src/gtk-glade/Makefile.am b/experimental/modest/src/gtk-glade/Makefile.am
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/experimental/modest/src/gtk/Makefile.am b/experimental/modest/src/gtk/Makefile.am
deleted file mode 100644 (file)
index e6866cf..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Makefile.am
-# Time-stamp: <2006-04-24 00:08:56 (djcb)>
-#
-#
-# use Automake 'trick' ==> convenience static libraries, which
-# won't be installed, just for linking
-#
-INCLUDES=\
-       $(MODEST_GSTUFF_CFLAGS) \
-       $(MODEST_GTK_CFLAGS) \
-       $(MODEST_TINYMAIL_CFLAGS)
-
-noinst_LTLIBRARIES=\
-       libmodest-ui.la
-
-libmodest_ui_la_SOURCES=\
-       modest-ui.c\
-       modest-main-window.h\
-       modest-main-window.c\
-       modest-edit-window.h\
-       modest-edit-window.c
-
-LDADD = \
-       $(MODEST_GSTUFF_LIBS) \
-       $(MODEST_GTK_LIBS) \
-       $(MODEST_TINYMAIL_LIBS)
diff --git a/experimental/modest/src/gtk/modest-edit-window.c b/experimental/modest/src/gtk/modest-edit-window.c
deleted file mode 100644 (file)
index 42538f1..0000000
+++ /dev/null
@@ -1,309 +0,0 @@
-/* modest-edit-window.c */
-
-/* insert (c)/licensing information) */
-
-#include <gtk/gtk.h>
-#include <string.h>
-#include "modest-edit-window.h"
-
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /*HAVE_CONFIG_H*/
-
-#include <glib/gi18n.h>
-
-/* include other impl specific header files */
-
-/* 'private'/'protected' functions */
-static void                    modest_edit_window_class_init    (ModestEditWindowClass *klass);
-static void                    modest_edit_window_init          (ModestEditWindow *obj);
-static void                    modest_edit_window_finalize      (GObject *obj);
-
-
-static GtkWidget* modest_edit_window_toolbar (void);
-
-static void on_send_clicked (GtkToolButton *button, gpointer data);
-static void on_cut_clicked (GtkToolButton *button, gpointer data);
-static void on_copy_clicked (GtkToolButton *button, gpointer data);
-static void on_paste_clicked (GtkToolButton *button, gpointer data);
-static void on_quit_clicked (GtkToolButton *button, gpointer data);
-static void on_save_clicked (GtkToolButton *button, gpointer data);
-
-
-
-/* list my signals */
-enum {
-       /* MY_SIGNAL_1, */
-       /* MY_SIGNAL_2, */
-       LAST_SIGNAL
-};
-
-typedef struct _ModestEditWindowPrivate ModestEditWindowPrivate;
-struct _ModestEditWindowPrivate {
-
-       GtkEntry      *to_entry;
-       GtkEntry      *cc_entry;
-       GtkEntry      *bcc_entry;
-       GtkEntry      *subject_entry;
-
-       GtkTextView   *body_text;
-       GtkStatusbar  *status_bar;
-       
-};
-#define MODEST_EDIT_WINDOW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
-                                                MODEST_TYPE_EDIT_WINDOW, \
-                                                ModestEditWindowPrivate))
-/* globals */
-static GtkWindowClass *parent_class = NULL;
-
-/* uncomment the following if you have defined any signals */
-/* static guint signals[LAST_SIGNAL] = {0}; */
-
-GType
-modest_edit_window_get_type (void)
-{
-       static GType my_type = 0;
-       if (!my_type) {
-               static const GTypeInfo my_info = {
-                       sizeof(ModestEditWindowClass),
-                       NULL,           /* base init */
-                       NULL,           /* base finalize */
-                       (GClassInitFunc) modest_edit_window_class_init,
-                       NULL,           /* class finalize */
-                       NULL,           /* class data */
-                       sizeof(ModestEditWindow),
-                       1,              /* n_preallocs */
-                       (GInstanceInitFunc) modest_edit_window_init,
-               };
-               my_type = g_type_register_static (GTK_TYPE_WINDOW,
-                                                 "ModestEditWindow",
-                                                 &my_info, 0);
-       }
-       return my_type;
-}
-
-static void
-modest_edit_window_class_init (ModestEditWindowClass *klass)
-{
-       GObjectClass *gobject_class;
-       gobject_class = (GObjectClass*) klass;
-
-       parent_class            = g_type_class_peek_parent (klass);
-       gobject_class->finalize = modest_edit_window_finalize;
-
-       g_type_class_add_private (gobject_class, sizeof(ModestEditWindowPrivate));
-
-       /* signal definitions go here, e.g.: */
-/*     signals[MY_SIGNAL_1] = */
-/*             g_signal_new ("my_signal_1",....); */
-/*     signals[MY_SIGNAL_2] = */
-/*             g_signal_new ("my_signal_2",....); */
-/*     etc. */
-}
-
-static void
-modest_edit_window_init (ModestEditWindow *self)
-{
-       ModestEditWindowPrivate *priv;
-       GtkWidget *vbox;
-       GtkWidget *to_button, *cc_button, *bcc_button;
-       GtkWidget *subject_label;
-       GtkWidget *table;
-       GtkWidget *scrolled_win;
-       GtkWidget *toolbar;
-       
-       priv = MODEST_EDIT_WINDOW_GET_PRIVATE(self);
-       
-       priv->to_entry         = GTK_ENTRY(gtk_entry_new_with_max_length (255));
-       priv->cc_entry         = GTK_ENTRY(gtk_entry_new_with_max_length (255));
-       priv->bcc_entry        = GTK_ENTRY(gtk_entry_new_with_max_length (255));
-       priv->subject_entry    = GTK_ENTRY(gtk_entry_new_with_max_length (255));        
-       priv->status_bar       = GTK_STATUSBAR(gtk_statusbar_new ());
-       
-       toolbar = modest_edit_window_toolbar ();
-       
-       to_button  = gtk_button_new_with_label (_("To..."));
-       cc_button  = gtk_button_new_with_label (_("Cc..."));
-       bcc_button = gtk_button_new_with_label (_("Bcc.."));
-
-       scrolled_win = gtk_scrolled_window_new (NULL, NULL);
-       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(scrolled_win),
-                                       GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
-       gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW(scrolled_win),
-                                            GTK_SHADOW_IN);
-       
-       subject_label = gtk_label_new ("Subject:");
-
-       table = gtk_table_new (4, 2, FALSE);
-
-       gtk_table_attach (GTK_TABLE(table), to_button,
-                         0, 1, 0, 1, 0, 0, 0, 0);
-       gtk_table_attach (GTK_TABLE(table), GTK_WIDGET(priv->to_entry),
-                         1, 2, 0, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
-       
-       gtk_table_attach (GTK_TABLE(table), cc_button,
-                         0, 1, 1, 2, 0, 0, 0, 0);
-       gtk_table_attach (GTK_TABLE(table), GTK_WIDGET(priv->cc_entry),
-                         1, 2, 1, 2, GTK_EXPAND|GTK_FILL, 0, 0, 0);
-
-       gtk_table_attach (GTK_TABLE(table), bcc_button,
-                         0, 1, 2, 3, 0, 0, 0, 0);
-       gtk_table_attach (GTK_TABLE(table), GTK_WIDGET(priv->bcc_entry),
-                         1, 2, 2, 3, GTK_EXPAND|GTK_FILL, 0, 0, 0);
-
-       gtk_table_attach (GTK_TABLE(table), subject_label,
-                         0, 1, 3, 4, 0, 0, 0, 0);
-       gtk_table_attach (GTK_TABLE(table), GTK_WIDGET(priv->subject_entry),
-                         1, 2, 3, 4, GTK_EXPAND|GTK_FILL, 0, 0, 0);
-
-       priv->body_text  = GTK_TEXT_VIEW(gtk_text_view_new ());
-
-       gtk_container_add (GTK_CONTAINER(scrolled_win), GTK_WIDGET(priv->body_text));
-       
-       vbox = gtk_vbox_new (FALSE, 5);
-
-       gtk_box_pack_start (GTK_BOX(vbox), toolbar,      FALSE, TRUE,2);        
-       gtk_box_pack_start (GTK_BOX(vbox), table,        FALSE, TRUE,2);
-       gtk_box_pack_start (GTK_BOX(vbox), scrolled_win, TRUE, TRUE, 2);
-       gtk_box_pack_start (GTK_BOX(vbox), GTK_WIDGET(priv->status_bar),
-                           FALSE, TRUE, 2);
-
-       /* make everything but the top level container visible,
-        * so gtk_widget_show will work */
-       gtk_widget_show_all (vbox);
-       gtk_container_add (GTK_CONTAINER(self), vbox);
-       
-}
-
-static void
-modest_edit_window_finalize (GObject *obj)
-{
-/*     free/unref instance resources here */
-}
-
-
-GtkWidget*
-modest_edit_window_new   (const gchar *to, const gchar *cc,
-                         const gchar *bcc, const gchar *subject,
-                         const gchar *body, const GSList *attachments)
-{
-
-       ModestEditWindowPrivate *priv;
-       GObject *obj = g_object_new(MODEST_TYPE_EDIT_WINDOW, NULL);
-       
-       priv = MODEST_EDIT_WINDOW_GET_PRIVATE(obj);
-
-       /* FIXME: valid utf-8 */
-
-       if (to)
-               gtk_entry_set_text (priv->to_entry, to);
-       if (cc)
-               gtk_entry_set_text (priv->cc_entry, cc);
-       if (bcc)
-               gtk_entry_set_text (priv->bcc_entry,bcc);
-
-       if (subject)
-               gtk_entry_set_text (priv->subject_entry, subject);
-       
-       if (body)
-               gtk_text_buffer_insert (gtk_text_view_get_buffer(priv->body_text),
-                                       NULL, body, strlen(body));
-
-       /* FIXME: attachments */
-       
-       return GTK_WIDGET(obj);
-}
-
-
-
-
-static GtkWidget*
-modest_edit_window_toolbar (void)
-{
-       GtkWidget *toolbar;
-       GtkToolItem *send, *save, *cut, *copy, *paste, *quit;
-
-       toolbar = gtk_toolbar_new ();
-
-       /* FIXME: get a better icon */
-       send  = gtk_tool_button_new_from_stock (GTK_STOCK_MEDIA_PLAY); 
-       
-       save  = gtk_tool_button_new_from_stock (GTK_STOCK_SAVE);
-       cut   = gtk_tool_button_new_from_stock (GTK_STOCK_CUT);
-       copy  = gtk_tool_button_new_from_stock (GTK_STOCK_COPY);
-       paste = gtk_tool_button_new_from_stock (GTK_STOCK_PASTE);
-       quit  = gtk_tool_button_new_from_stock (GTK_STOCK_QUIT);
-
-       g_signal_connect (send, "clicked", G_CALLBACK(on_send_clicked),
-                         "send");
-       g_signal_connect (save, "clicked", G_CALLBACK(on_save_clicked),
-                         "save");
-       g_signal_connect (cut, "clicked", G_CALLBACK(on_cut_clicked),
-                         "cut");
-       g_signal_connect (copy, "clicked", G_CALLBACK(on_copy_clicked),
-                         "copy");
-       g_signal_connect (paste, "clicked", G_CALLBACK(on_paste_clicked),
-                         "send");
-       g_signal_connect (quit, "clicked", G_CALLBACK(on_quit_clicked),
-                         "quit");
-
-       gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(send), -1);
-       gtk_toolbar_insert (GTK_TOOLBAR(toolbar),
-                           GTK_TOOL_ITEM(gtk_separator_tool_item_new()),
-                           -1);
-       gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(save), -1);
-       gtk_toolbar_insert (GTK_TOOLBAR(toolbar),
-                           GTK_TOOL_ITEM(gtk_separator_tool_item_new()),
-                           -1);
-       
-       gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(cut), -1);
-       gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(copy), -1);
-       gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(paste), -1);
-
-       gtk_toolbar_insert (GTK_TOOLBAR(toolbar),
-                           GTK_TOOL_ITEM(gtk_separator_tool_item_new()),
-                           -1);
-       gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(quit), -1);
-
-       return toolbar;
-}
-
-
-static void
-on_send_clicked (GtkToolButton *button, gpointer data)
-{
-       g_warning ("clicked: %s", (gchar *)data);
-}
-
-static void
-on_cut_clicked (GtkToolButton *button, gpointer data)
-{
-       g_warning (__FUNCTION__);
-}
-static void
-on_copy_clicked (GtkToolButton *button, gpointer data)
-{
-       g_warning (__FUNCTION__);
-}
-static void
-on_paste_clicked (GtkToolButton *button, gpointer data)
-{
-       g_warning (__FUNCTION__);
-}
-
-static void
-on_save_clicked (GtkToolButton *button, gpointer data)
-{
-       g_warning (__FUNCTION__);
-}
-
-
-
-static void
-on_quit_clicked (GtkToolButton *button, gpointer data)
-{
-       g_warning (__FUNCTION__);
-}
-
-
diff --git a/experimental/modest/src/gtk/modest-edit-window.h b/experimental/modest/src/gtk/modest-edit-window.h
deleted file mode 100644 (file)
index c048d09..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/* modest-edit-window.h */
-/* insert (c)/licensing information) */
-
-#ifndef __MODEST_EDIT_WINDOW_H__
-#define __MODEST_EDIT_WINDOW_H__
-
-#include <gtk/gtkwindow.h>
-/* other include files */
-
-G_BEGIN_DECLS
-
-/* convenience macros */
-#define MODEST_TYPE_EDIT_WINDOW             (modest_edit_window_get_type())
-#define MODEST_EDIT_WINDOW(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj),MODEST_TYPE_EDIT_WINDOW,ModestEditWindow))
-#define MODEST_EDIT_WINDOW_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass),MODEST_TYPE_EDIT_WINDOW,GtkWindow))
-#define MODEST_IS_EDIT_WINDOW(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj),MODEST_TYPE_EDIT_WINDOW))
-#define MODEST_IS_EDIT_WINDOW_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass),MODEST_TYPE_EDIT_WINDOW))
-#define MODEST_EDIT_WINDOW_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj),MODEST_TYPE_EDIT_WINDOW,ModestEditWindowClass))
-
-typedef struct _ModestEditWindow      ModestEditWindow;
-typedef struct _ModestEditWindowClass ModestEditWindowClass;
-
-struct _ModestEditWindow {
-        GtkWindow parent;      
-};
-
-struct _ModestEditWindowClass {
-       GtkWindowClass parent_class;
-       /* insert signal callback declarations, eg. */
-       /* void (* my_event) (ModestEditWindow* obj); */
-};
-
-/* member functions */
-GType        modest_edit_window_get_type    (void) G_GNUC_CONST;
-
-
-GtkWidget*   modest_edit_window_new         (const gchar *to,
-                                            const gchar *cc,
-                                            const gchar *bcc,
-                                            const gchar *subject,
-                                            const gchar *body,
-                                            const GSList *attachments);
-/* fill in other public functions, eg.: */
-/*     void       modest_edit_window_do_something (ModestEditWindow *self, const gchar* param); */
-/*     gboolean   modest_edit_window_has_foo      (ModestEditWindow *self, gint value); */
-
-
-G_END_DECLS
-
-#endif /* __MODEST_EDIT_WINDOW_H__ */
-
diff --git a/experimental/modest/src/gtk/modest-main-window.c b/experimental/modest/src/gtk/modest-main-window.c
deleted file mode 100644 (file)
index b9afa9a..0000000
+++ /dev/null
@@ -1,546 +0,0 @@
-/* modest-main-window.c */
-
-/* insert (c)/licensing information) */
-#include <gtk/gtk.h>
-#include <string.h>
-
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /*HAVE_CONFIG_H*/
-
-#include <glib/gi18n.h>
-#include "modest-main-window.h"
-
-
-
-#include "../modest-tny-account-store.h"
-#include "../modest-tny-folder-tree-view.h"
-#include "../modest-tny-header-tree-view.h"
-#include "../modest-tny-msg-view.h"
-
-
-
-/* 'private'/'protected' functions */
-static void   modest_main_window_class_init    (ModestMainWindowClass *klass);
-static void   modest_main_window_init          (ModestMainWindow *obj,
-                                               ModestConf *conf,
-                                               ModestAccountMgr *modest_acc_mgr);
-static void   modest_main_window_finalize      (GObject *obj);
-
-
-static GtkWidget* modest_main_window_folder_tree (ModestAccountMgr *modest_acc_mgr);
-static GtkWidget* modest_main_window_header_tree (TnyMsgFolderIface *folder);
-
-static GtkWidget* modest_main_window_toolbar (void);
-static GtkWidget* modest_main_window_favorite_folder_list (void);
-static GtkWidget* modest_main_window_message_preview (void);
-static GtkWidget * modest_main_window_get_ui (ModestTnyFolderTreeView *folder_view,
-                                             ModestTnyHeaderTreeView  *header_view,
-                                             ModestTnyMsgView *message_view);
-static void on_newmail_clicked (GtkToolButton *button, gpointer data);
-static void on_refresh_clicked (GtkToolButton *button, gpointer data);
-static void on_reply_clicked (GtkToolButton *button, gpointer data);
-static void on_forward_clicked (GtkToolButton *button, gpointer data);
-static void on_delmail_clicked (GtkToolButton *button, gpointer data);
-static void on_cut_clicked (GtkToolButton *button, gpointer data);
-static void on_copy_clicked (GtkToolButton *button, gpointer data);
-static void on_paste_clicked (GtkToolButton *button, gpointer data);
-static void on_quit_clicked (GtkToolButton *button, gpointer data);
-
-static void on_folder_clicked (ModestTnyFolderTreeView *self,
-                              TnyMsgFolderIface *folder,
-                              gpointer data);
-static void on_message_clicked (ModestTnyFolderTreeView *folder_tree,
-                               TnyMsgIface *message,
-                               gpointer data);
-                              
-
-
-/* list my signals */
-enum {
-       /* MY_SIGNAL_1, */
-       /* MY_SIGNAL_2, */
-       LAST_SIGNAL
-};
-
-typedef struct _ModestMainWindowPrivate ModestMainWindowPrivate;
-struct _ModestMainWindowPrivate {
-
-       ModestConf       *modest_conf;
-       ModestAccountMgr *modest_acc_mgr;
-
-       ModestTnyFolderTreeView  *folder_view;
-       ModestTnyHeaderTreeView  *header_view;
-       ModestTnyMsgView         *message_view;
-};
-#define MODEST_MAIN_WINDOW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
-                                                MODEST_TYPE_MAIN_WINDOW, \
-                                                ModestMainWindowPrivate))
-/* globals */
-static GtkWidgetClass *parent_class = NULL;
-
-/* uncomment the following if you have defined any signals */
-/* static guint signals[LAST_SIGNAL] = {0}; */
-
-GType
-modest_main_window_get_type (void)
-{
-       static GType my_type = 0;
-       if (!my_type) {
-               static const GTypeInfo my_info = {
-                       sizeof(ModestMainWindowClass),
-                       NULL,           /* base init */
-                       NULL,           /* base finalize */
-                       (GClassInitFunc) modest_main_window_class_init,
-                       NULL,           /* class finalize */
-                       NULL,           /* class data */
-                       sizeof(ModestMainWindow),
-                       1,              /* n_preallocs */
-                       (GInstanceInitFunc) modest_main_window_init,
-               };
-               my_type = g_type_register_static (GTK_TYPE_WINDOW,
-                                                 "ModestMainWindow",
-                                                 &my_info, 0);
-       }
-       return my_type;
-}
-
-static void
-modest_main_window_class_init (ModestMainWindowClass *klass)
-{
-       GObjectClass *gobject_class;
-       gobject_class = (GObjectClass*) klass;
-
-       parent_class            = g_type_class_peek_parent (klass);
-       gobject_class->finalize = modest_main_window_finalize;
-
-       g_type_class_add_private (gobject_class, sizeof(ModestMainWindowPrivate));
-
-       /* signal definitions go here, e.g.: */
-/*     signals[MY_SIGNAL_1] = */
-/*             g_signal_new ("my_signal_1",....); */
-/*     signals[MY_SIGNAL_2] = */
-/*             g_signal_new ("my_signal_2",....); */
-/*     etc. */
-}
-
-static GtkWidget*
-wrapped_in_scrolled_win (GtkWidget *child)
-{
-       GtkWidget *scrolled_win;
-
-       scrolled_win = gtk_scrolled_window_new (NULL, NULL);
-       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(scrolled_win),
-                                       GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
-       gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW(scrolled_win),
-                                            GTK_SHADOW_IN);
-       gtk_container_add (GTK_CONTAINER(scrolled_win), child);
-       return scrolled_win;
-}
-
-       
-
-static void
-modest_main_window_init (ModestMainWindow *obj, ModestConf *modest_conf,
-                        ModestAccountMgr *modest_acc_mgr)
-{
-}
-
-
-
-
-
-static void
-modest_main_window_finalize (GObject *obj)
-{
-       ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE (obj);
-
-       priv->modest_conf    = NULL;
-       priv->modest_acc_mgr = NULL;
-}
-
-
-
-GtkWidget*
-modest_main_window_new (ModestConf *modest_conf, ModestAccountMgr *modest_acc_mgr)
-{
-       
-       GtkWidget *ui;
-       ModestMainWindow *self =
-               MODEST_MAIN_WINDOW(g_object_new(MODEST_TYPE_MAIN_WINDOW, NULL));
-       ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self);
-
-       priv->modest_conf    = modest_conf;
-       priv->modest_acc_mgr = modest_acc_mgr;  
-       
-       priv->header_view    =  MODEST_TNY_HEADER_TREE_VIEW(modest_main_window_header_tree (NULL));
-       g_signal_connect (priv->header_view, "message_selected", 
-                         G_CALLBACK(on_message_clicked),
-                         self);
-       
-       priv->folder_view    =  MODEST_TNY_FOLDER_TREE_VIEW(modest_main_window_folder_tree
-                                                           (modest_acc_mgr));
-       g_signal_connect (priv->folder_view, "folder_selected", 
-                         G_CALLBACK(on_folder_clicked),
-                         self);
-
-       priv->message_view    = MODEST_TNY_MSG_VIEW (modest_main_window_message_preview());
-       
-       ui = modest_main_window_get_ui(priv->folder_view,
-                                      priv->header_view,
-                                      priv->message_view);
-       gtk_container_add (GTK_CONTAINER(self), ui);
-
-       return GTK_WIDGET(self);
-}
-       
-
-
-
-static GtkWidget *
-modest_main_window_get_ui (ModestTnyFolderTreeView *folder_view,
-                          ModestTnyHeaderTreeView  *header_view,
-                          ModestTnyMsgView         *message_view)
-
-{
-       GtkWidget *vbox;
-       GtkWidget *msg_vpaned,*folder_vpaned, *folder_msg_hpaned;
-       GtkWidget *toolbar, *fav_folder_list;
-       GtkWidget *status_bar;
-       GtkWidget *swin_msg_list,*swin_folder_list, *swin_favfolder_list;
-       GtkWidget *folder_label, *message_label;
-       GtkWidget *folder_vbox, *message_vbox;
-       
-       toolbar     = modest_main_window_toolbar ();
-       fav_folder_list = modest_main_window_favorite_folder_list ();
-       vbox   = gtk_vbox_new  (FALSE,2);
-
-       folder_vbox  = gtk_vbox_new  (FALSE,2);
-       message_vbox = gtk_vbox_new  (FALSE,2);
-
-       msg_vpaned = gtk_vpaned_new ();
-       folder_vpaned = gtk_vpaned_new ();
-       folder_msg_hpaned = gtk_hpaned_new  ();
-       
-       swin_msg_list    = wrapped_in_scrolled_win (GTK_WIDGET(header_view));
-       swin_folder_list = wrapped_in_scrolled_win (GTK_WIDGET(folder_view));
-       swin_favfolder_list = wrapped_in_scrolled_win (fav_folder_list);
-
-       folder_label  = gtk_label_new (_("Folders"));
-       gtk_label_set_justify (folder_label, GTK_JUSTIFY_LEFT);
-       
-       gtk_paned_add1 (GTK_PANED(folder_vpaned), swin_favfolder_list);
-       gtk_paned_add2 (GTK_PANED(folder_vpaned), swin_folder_list);
-       gtk_box_pack_start (GTK_BOX(folder_vbox), folder_label, FALSE, TRUE, 0);
-       gtk_box_pack_start (GTK_BOX(folder_vbox), folder_vpaned, TRUE, TRUE, 0);
-
-       message_label=  gtk_label_new (_("Inbox"));
-       gtk_label_set_justify (message_label, GTK_JUSTIFY_LEFT);
-       gtk_paned_add1 (GTK_PANED(msg_vpaned), swin_msg_list);
-       gtk_paned_add2 (GTK_PANED(msg_vpaned), GTK_WIDGET(message_view));
-       gtk_box_pack_start (GTK_BOX(message_vbox), message_label, FALSE, TRUE, 0);
-       gtk_box_pack_start (GTK_BOX(message_vbox), msg_vpaned, TRUE, TRUE, 0);
-
-       
-       gtk_paned_add1 (GTK_PANED(folder_msg_hpaned), folder_vbox);
-       gtk_paned_add2 (GTK_PANED(folder_msg_hpaned), message_vbox);
-
-       gtk_box_pack_start (GTK_BOX(vbox), toolbar, FALSE, TRUE, 0);
-       gtk_box_pack_start (GTK_BOX(vbox), folder_msg_hpaned, TRUE, TRUE, 0);
-
-       status_bar = gtk_statusbar_new ();
-       gtk_box_pack_start (GTK_BOX(vbox), status_bar, FALSE, FALSE, 0);
-       
-       gtk_widget_show_all (GTK_WIDGET(vbox));
-       return vbox;
-}
-
-
-
-static GtkWidget*
-modest_main_window_header_tree (TnyMsgFolderIface *folder)
-{
-       GtkTreeViewColumn *column;
-       GtkCellRenderer *renderer = gtk_cell_renderer_text_new (); 
-       GtkWidget *header_tree;
-       
-       header_tree = GTK_WIDGET(modest_tny_header_tree_view_new(folder));
-       if (!header_tree) {
-               g_warning ("could not create header tree");
-               return NULL;
-       }
-
-       column =  gtk_tree_view_column_new_with_attributes(_("Date"), renderer,
-                                                          "text",
-                                                          TNY_MSG_HEADER_LIST_MODEL_DATE_RECEIVED_COLUMN,
-                                                          NULL);
-       gtk_tree_view_column_set_resizable (column, TRUE);
-       gtk_tree_view_append_column (GTK_TREE_VIEW(header_tree), column);
-
-
-
-       column =  gtk_tree_view_column_new_with_attributes(_("From"), renderer,
-                                                          "text",
-                                                          TNY_MSG_HEADER_LIST_MODEL_FROM_COLUMN,
-                                                          NULL);
-       gtk_tree_view_column_set_resizable (column, TRUE);
-       gtk_tree_view_append_column (GTK_TREE_VIEW(header_tree), column);
-
-
-       column =  gtk_tree_view_column_new_with_attributes(_("Subject"), renderer,
-                                                          "text",
-                                                          TNY_MSG_HEADER_LIST_MODEL_SUBJECT_COLUMN,
-                                                          NULL);
-       gtk_tree_view_column_set_resizable (column, TRUE);
-       gtk_tree_view_append_column (GTK_TREE_VIEW(header_tree), column);
-
-       gtk_tree_view_set_headers_visible   (GTK_TREE_VIEW(header_tree), TRUE);
-       gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(header_tree), TRUE);
-       
-       return GTK_WIDGET(header_tree);
-}
-
-
-
-static GtkWidget*
-modest_main_window_folder_tree (ModestAccountMgr *modest_acc_mgr)
-{
-       GtkTreeViewColumn *column;
-       GtkCellRenderer *renderer = gtk_cell_renderer_text_new (); 
-       GtkWidget *folder_tree;
-       TnyAccountStoreIface *account_store_iface =
-               TNY_ACCOUNT_STORE_IFACE(modest_tny_account_store_new (modest_acc_mgr));
-       if (!account_store_iface) {
-               g_warning ("could not initialze ModestTnyAccountStore");
-               return NULL;
-       }
-       
-       folder_tree = modest_tny_folder_tree_view_new (account_store_iface);
-       if (!folder_tree) {
-               g_warning ("could not create folder list");
-               return NULL;
-       }
-
-       column = gtk_tree_view_column_new_with_attributes(_("All Mail Folders"),
-                                                         renderer,"text",
-                                                         TNY_ACCOUNT_TREE_MODEL_NAME_COLUMN,
-                                                         NULL);        
-       gtk_tree_view_column_set_resizable (column, TRUE);
-       gtk_tree_view_append_column (GTK_TREE_VIEW(folder_tree), column);
-
-       column = gtk_tree_view_column_new_with_attributes(_("Unread"),
-                                                         renderer, "text",
-                                                         TNY_ACCOUNT_TREE_MODEL_UNREAD_COLUMN,
-                                                         NULL);
-       gtk_tree_view_column_set_resizable (column, TRUE);
-       gtk_tree_view_append_column (GTK_TREE_VIEW(folder_tree), column);
-
-       
-       gtk_tree_view_set_headers_visible   (GTK_TREE_VIEW(folder_tree), TRUE);
-       gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(folder_tree), TRUE);
-
-       return folder_tree;
-}
-
-
-static GtkWidget*
-modest_main_window_favorite_folder_list (void)
-{
-       GtkWidget *folder_list;
-       GtkListStore *folder_store;
-       GtkTreeIter iter;
-       GtkCellRenderer *renderer = gtk_cell_renderer_text_new (); 
-
-       folder_store = gtk_list_store_new (1, G_TYPE_STRING);
-       folder_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL(folder_store));
-       
-       renderer = gtk_cell_renderer_text_new();
-       
-       gtk_tree_view_insert_column (GTK_TREE_VIEW(folder_list),
-                                    gtk_tree_view_column_new_with_attributes(_("Favorite Folders"),
-                                                                             renderer,
-                                                                             "text", 0,
-                                                                             NULL),
-                                    0);
-       gtk_list_store_insert_with_values (GTK_LIST_STORE(folder_store),
-                                          &iter, -1, 0, _("Stuff"), -1);       
-       return folder_list;
-}
-
-
-static GtkWidget*
-modest_main_window_toolbar (void)
-{
-       GtkWidget *toolbar;
-       GtkToolItem *newmail, *refresh, *reply, *forward,
-               *cut, *copy, *paste, *delmail, *quit;
-
-       gpointer modest_ui = NULL; /* FIXME */
-       
-       toolbar = gtk_toolbar_new ();
-
-       newmail = gtk_tool_button_new_from_stock (GTK_STOCK_NEW); 
-       delmail = gtk_tool_button_new_from_stock (GTK_STOCK_DELETE);
-
-       reply   = gtk_tool_button_new_from_stock (GTK_STOCK_MEDIA_PLAY);
-       forward = gtk_tool_button_new_from_stock (GTK_STOCK_MEDIA_FORWARD);
-
-       refresh = gtk_tool_button_new_from_stock (GTK_STOCK_REFRESH);
-       
-       cut  = gtk_tool_button_new_from_stock (GTK_STOCK_CUT);  
-       copy  = gtk_tool_button_new_from_stock (GTK_STOCK_COPY);
-       paste = gtk_tool_button_new_from_stock (GTK_STOCK_PASTE);
-       
-       quit  = gtk_tool_button_new_from_stock (GTK_STOCK_QUIT);
-
-       g_signal_connect (newmail, "clicked", G_CALLBACK(on_newmail_clicked),
-                         modest_ui);
-       g_signal_connect (refresh, "clicked", G_CALLBACK(on_refresh_clicked),
-                         modest_ui);
-       g_signal_connect (reply, "clicked", G_CALLBACK(on_reply_clicked),
-                         modest_ui);
-       g_signal_connect (forward, "clicked", G_CALLBACK(on_forward_clicked),
-                         modest_ui);
-       g_signal_connect (cut, "clicked", G_CALLBACK(on_cut_clicked),
-                         modest_ui);
-       g_signal_connect (copy, "clicked", G_CALLBACK(on_copy_clicked),
-                         modest_ui);
-       g_signal_connect (paste, "clicked", G_CALLBACK(on_paste_clicked),
-                         modest_ui);   
-       g_signal_connect (delmail, "clicked", G_CALLBACK(on_delmail_clicked),
-                         modest_ui);
-       g_signal_connect (quit, "clicked", G_CALLBACK(on_quit_clicked),
-                         modest_ui);
-
-       gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(newmail), -1);
-       gtk_toolbar_insert (GTK_TOOLBAR(toolbar),
-                           GTK_TOOL_ITEM(gtk_separator_tool_item_new()),
-                           -1);
-       gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(refresh), -1);
-       gtk_toolbar_insert (GTK_TOOLBAR(toolbar),
-                           GTK_TOOL_ITEM(gtk_separator_tool_item_new()),
-                           -1);
-       gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(reply), -1);
-       gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(forward), -1);
-       
-       gtk_toolbar_insert (GTK_TOOLBAR(toolbar),
-                           GTK_TOOL_ITEM(gtk_separator_tool_item_new()),
-                           -1);
-
-       gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(cut), -1);
-       gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(copy), -1);
-       gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(paste), -1);
-       gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(delmail), -1);
-       
-       gtk_toolbar_insert (GTK_TOOLBAR(toolbar),
-                           GTK_TOOL_ITEM(gtk_separator_tool_item_new()),
-                           -1);
-       gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(quit), -1);
-
-       return toolbar;
-}
-
-
-static GtkWidget*
-modest_main_window_message_preview ()
-{
-       ModestTnyMsgView *msg_view;
-
-       msg_view = MODEST_TNY_MSG_VIEW(modest_tny_msg_view_new (NULL));
-       
-       return GTK_WIDGET(msg_view);    
-}
-
-
-static void
-on_newmail_clicked (GtkToolButton *button, gpointer data)
-{
-       g_warning (__FUNCTION__);
-}
-
-static void
-on_refresh_clicked (GtkToolButton *button, gpointer data)
-{
-       g_warning (__FUNCTION__);
-}
-static void
-on_reply_clicked (GtkToolButton *button, gpointer data)
-{
-       g_warning (__FUNCTION__);
-}
-static void
-on_forward_clicked (GtkToolButton *button, gpointer data)
-{
-       g_warning (__FUNCTION__);
-}
-static void
-on_delmail_clicked (GtkToolButton *button, gpointer data)
-{
-       g_warning (__FUNCTION__);
-}
-
-static void
-on_cut_clicked (GtkToolButton *button, gpointer data)
-{
-       g_warning (__FUNCTION__);
-
-}
-static void
-on_copy_clicked (GtkToolButton *button, gpointer data)
-{
-       g_warning (__FUNCTION__);
-
-}
-static void
-on_paste_clicked (GtkToolButton *button, gpointer data)
-{
-       g_warning (__FUNCTION__);
-}
-
-
-static void
-on_quit_clicked (GtkToolButton *button, gpointer data)
-{
-       g_warning (__FUNCTION__);
-       gtk_main_quit();
-}
-
-
-
-static void on_folder_clicked (ModestTnyFolderTreeView *folder_tree,
-                              TnyMsgFolderIface *folder,
-                              gpointer data)
-{
-       ModestMainWindow *self;
-       ModestMainWindowPrivate *priv; 
-
-       g_return_if_fail (folder);
-       g_return_if_fail (data);
-       
-       self = MODEST_MAIN_WINDOW(data);
-       priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self);
-               
-       modest_tny_header_tree_view_set_folder (priv->header_view,
-                                               folder);        
-}
-
-
-
-static void on_message_clicked (ModestTnyFolderTreeView *folder_tree,
-                               TnyMsgIface *message,
-                               gpointer data)
-{
-       ModestMainWindow *self;
-       ModestMainWindowPrivate *priv; 
-
-       g_return_if_fail (message);
-       g_return_if_fail (data);
-
-       self = MODEST_MAIN_WINDOW(data);
-       priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self);
-               
-       modest_tny_msg_view_set_message (priv->message_view,
-                                        message);
-}
-
diff --git a/experimental/modest/src/gtk/modest-main-window.h b/experimental/modest/src/gtk/modest-main-window.h
deleted file mode 100644 (file)
index e8ce12a..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/* modest-main-window.h */
-/* insert (c)/licensing information) */
-
-#ifndef __MODEST_MAIN_WINDOW_H__
-#define __MODEST_MAIN_WINDOW_H__
-
-
-#include <gtk/gtk.h>
-#include "../modest-conf.h"
-#include "../modest-account-mgr.h"
-
-/* other include files */
-
-G_BEGIN_DECLS
-
-/* convenience macros */
-#define MODEST_TYPE_MAIN_WINDOW             (modest_main_window_get_type())
-#define MODEST_MAIN_WINDOW(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj),MODEST_TYPE_MAIN_WINDOW,ModestMainWindow))
-#define MODEST_MAIN_WINDOW_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass),MODEST_TYPE_MAIN_WINDOW,GtkWidget))
-#define MODEST_IS_MAIN_WINDOW(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj),MODEST_TYPE_MAIN_WINDOW))
-#define MODEST_IS_MAIN_WINDOW_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass),MODEST_TYPE_MAIN_WINDOW))
-#define MODEST_MAIN_WINDOW_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj),MODEST_TYPE_MAIN_WINDOW,ModestMainWindowClass))
-
-typedef struct _ModestMainWindow      ModestMainWindow;
-typedef struct _ModestMainWindowClass ModestMainWindowClass;
-
-
-struct _ModestMainWindow {
-        GtkWindow parent;
-       /* insert public members, if any */
-};
-
-struct _ModestMainWindowClass {
-       GtkWindowClass parent_class;
-       /* insert signal callback declarations, eg. */
-       /* void (* my_event) (ModestMainWindow* obj); */
-};
-
-
-
-/* member functions */
-GType        modest_main_window_get_type    (void) G_GNUC_CONST;
-
-/* typical parameter-less _new function */
-/* if this is a kind of GtkWidget, it should probably return at GtkWidget*, */
-/*    otherwise probably a GObject*. */
-GtkWidget*    modest_main_window_new         (ModestConf *modest_conf,
-                                             ModestAccountMgr *modest_acc_mgr);
-
-/* fill in other public functions, eg.: */
-/*     void       modest_main_window_do_something (ModestMainWindow *self, const gchar* param); */
-/*     gboolean   modest_main_window_has_foo      (ModestMainWindow *self, gint value); */
-
-
-G_END_DECLS
-
-#endif /* __MODEST_MAIN_WINDOW_H__ */
-
diff --git a/experimental/modest/src/gtk/modest-ui.c b/experimental/modest/src/gtk/modest-ui.c
deleted file mode 100644 (file)
index 4146aa6..0000000
+++ /dev/null
@@ -1,250 +0,0 @@
-/* modest-ui.c */
-
-/* insert (c)/licensing information) */
-
-#include <gtk/gtk.h>
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /*HAVE_CONFIG_H*/
-
-#include "modest-main-window.h"
-#include "modest-edit-window.h"
-
-#include "../modest-ui.h"
-#include "../modest-window-mgr.h"
-#include "../modest-account-mgr.h"
-
-
-/* include other impl specific header files */
-
-/* 'private'/'protected' functions */
-static void   modest_ui_class_init     (ModestUIClass *klass);
-static void   modest_ui_init           (ModestUI *obj);
-static void   modest_ui_finalize       (GObject *obj);
-
-static void    modest_ui_window_destroy    (GtkWidget *win, gpointer data);
-static void    modest_ui_last_window_closed (GObject *obj, gpointer data);
-
-
-
-/* list my signals */
-enum {
-       /* MY_SIGNAL_1, */
-       /* MY_SIGNAL_2, */
-       LAST_SIGNAL
-};
-
-
-typedef struct _ModestUIPrivate ModestUIPrivate;
-struct _ModestUIPrivate {
-       
-       ModestConf           *modest_conf;
-       ModestAccountMgr     *modest_acc_mgr;
-       ModestWindowMgr      *modest_window_mgr;
-       
-       GtkWindow            *main_window;
-       GSList*              *edit_window_list;      
-
-};
-#define MODEST_UI_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
-                                       MODEST_TYPE_UI, \
-                                       ModestUIPrivate))
-/* globals */
-static GObjectClass *parent_class = NULL;
-
-/* uncomment the following if you have defined any signals */
-/* static guint signals[LAST_SIGNAL] = {0}; */
-
-GType
-modest_ui_get_type (void)
-{
-       static GType my_type = 0;
-       if (!my_type) {
-               static const GTypeInfo my_info = {
-                       sizeof(ModestUIClass),
-                       NULL,           /* base init */
-                       NULL,           /* base finalize */
-                       (GClassInitFunc) modest_ui_class_init,
-                       NULL,           /* class finalize */
-                       NULL,           /* class data */
-                       sizeof(ModestUI),
-                       1,              /* n_preallocs */
-                       (GInstanceInitFunc) modest_ui_init,
-               };
-               my_type = g_type_register_static (G_TYPE_OBJECT,
-                                                 "ModestUI",
-                                                 &my_info, 0);
-       }
-       return my_type;
-}
-
-static void
-modest_ui_class_init (ModestUIClass *klass)
-{
-       GObjectClass *gobject_class;
-       gobject_class = (GObjectClass*) klass;
-
-       parent_class            = g_type_class_peek_parent (klass);
-       gobject_class->finalize = modest_ui_finalize;
-
-       g_type_class_add_private (gobject_class, sizeof(ModestUIPrivate));
-
-       /* signal definitions go here, e.g.: */
-/*     signals[MY_SIGNAL_1] = */
-/*             g_signal_new ("my_signal_1",....); */
-/*     signals[MY_SIGNAL_2] = */
-/*             g_signal_new ("my_signal_2",....); */
-/*     etc. */
-}
-
-static void
-modest_ui_init (ModestUI *obj)
-{
-       ModestUIPrivate *priv = MODEST_UI_GET_PRIVATE(obj);
-
-       priv->modest_acc_mgr    = NULL;
-       priv->modest_conf       = NULL;
-       priv->modest_window_mgr = NULL;
-
-}
-
-static void
-modest_ui_finalize (GObject *obj)
-{
-       ModestUIPrivate *priv = MODEST_UI_GET_PRIVATE(obj);     
-       
-       if (priv->modest_acc_mgr)
-               g_object_unref (priv->modest_acc_mgr);
-       priv->modest_acc_mgr = NULL;
-       
-       if (priv->modest_conf)
-               g_object_unref (priv->modest_conf);
-       priv->modest_conf = NULL;
-       
-       if (priv->modest_window_mgr)
-               g_object_unref (priv->modest_window_mgr);
-       priv->modest_window_mgr = NULL;
-}
-       
-GObject*
-modest_ui_new (ModestConf *modest_conf)
-{
-       GObject *obj;
-       ModestUIPrivate *priv;
-       ModestAccountMgr *modest_acc_mgr;
-
-       g_return_val_if_fail (modest_conf, NULL);
-
-       obj = g_object_new(MODEST_TYPE_UI, NULL);       
-       priv = MODEST_UI_GET_PRIVATE(obj);
-
-       modest_acc_mgr = MODEST_ACCOUNT_MGR(modest_account_mgr_new (modest_conf));
-       if (!modest_acc_mgr) {
-               g_warning ("could not create ModestAccountMgr instance");
-               g_object_unref (obj);
-               return NULL;
-       }
-       
-       priv->modest_acc_mgr = modest_acc_mgr;
-       g_object_ref (priv->modest_conf = modest_conf);
-
-       priv->modest_window_mgr = MODEST_WINDOW_MGR(modest_window_mgr_new());
-       g_signal_connect (priv->modest_window_mgr, "last_window_closed",
-                         G_CALLBACK(modest_ui_last_window_closed),
-                         NULL);
-       return obj;
-}
-
-
-gboolean
-modest_ui_show_main_window (ModestUI *modest_ui)
-{
-       GtkWidget       *win;
-       int              height, width;
-       ModestUIPrivate *priv;
-
-       priv = MODEST_UI_GET_PRIVATE(modest_ui);
-       
-       height = modest_conf_get_int (priv->modest_conf,
-                                     MODEST_CONF_MAIN_WINDOW_HEIGHT,NULL);
-       width  = modest_conf_get_int (priv->modest_conf,
-                                     MODEST_CONF_MAIN_WINDOW_WIDTH,NULL);
-       
-       win = modest_main_window_new (priv->modest_conf,
-                                     priv->modest_acc_mgr);
-       if (!win) {
-               g_warning ("could not create main window");
-               return FALSE;
-       }
-
-       modest_window_mgr_register (priv->modest_window_mgr,
-                                   G_OBJECT(win), MODEST_MAIN_WINDOW, 0);
-       
-       g_signal_connect (win, "destroy", G_CALLBACK(modest_ui_window_destroy),
-                         modest_ui);
-       
-       gtk_widget_set_usize (GTK_WIDGET(win), height, width);
-       gtk_window_set_title (GTK_WINDOW(win), PACKAGE_STRING);
-       
-       gtk_widget_show (win);
-       return TRUE;
-}
-
-
-gboolean
-modest_ui_show_edit_window (ModestUI *modest_ui, const gchar* to,
-                           const gchar* cc, const gchar* bcc,
-                           const gchar* subject, const gchar *body,
-                           const GSList* att)
-{
-       GtkWidget       *win;
-       ModestUIPrivate *priv;
-
-       priv = MODEST_UI_GET_PRIVATE(modest_ui);
-       int height = modest_conf_get_int (priv->modest_conf,
-                                         MODEST_CONF_EDIT_WINDOW_HEIGHT,NULL);
-       int width  = modest_conf_get_int (priv->modest_conf,
-                                         MODEST_CONF_EDIT_WINDOW_WIDTH,NULL);
-       
-       win = modest_edit_window_new (to, cc, bcc, subject, body, att);
-       if (!win) {
-               g_warning ("could not create edit window");
-               return FALSE;
-       }
-       
-       modest_window_mgr_register (priv->modest_window_mgr,
-                                   G_OBJECT(win), MODEST_EDIT_WINDOW, 0);
-
-       g_signal_connect (win, "destroy", G_CALLBACK(modest_ui_window_destroy),
-                         modest_ui);
-
-       gtk_widget_set_usize (GTK_WIDGET(win), height, width);
-       gtk_window_set_title (GTK_WINDOW(win),
-                             subject ? subject : "Untitled");
-
-       gtk_widget_show (win);
-
-       return TRUE;
-}
-
-
-static void
-modest_ui_window_destroy (GtkWidget *win, gpointer data)
-{
-       ModestUIPrivate *priv;
-
-       g_return_if_fail (data);
-
-       priv = MODEST_UI_GET_PRIVATE((ModestUI*)data);
-       if (!modest_window_mgr_unregister (priv->modest_window_mgr, G_OBJECT(win)))
-               g_warning ("modest window mgr: failed to unregister %p",
-                          G_OBJECT(win));
-}
-
-
-static void
-modest_ui_last_window_closed (GObject *obj, gpointer data)
-{
-       gtk_main_quit ();
-}
diff --git a/experimental/modest/src/hildon/Makefile.am b/experimental/modest/src/hildon/Makefile.am
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/experimental/modest/src/modest-account-keys.h b/experimental/modest/src/modest-account-keys.h
deleted file mode 100644 (file)
index 39ada93..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef __MODEST_ACCOUNT_KEYS_H__
-#define __MODEST_ACCOUNT_KEYS_H__
-
-#include "modest-conf-keys.h"
-
-#define MODEST_CONF_DEFAULT_ACCOUNT     "/default_account"
-
-/* configuration key definitions for modest */
-#define MODEST_ACCOUNT_NAMESPACE       MODEST_CONF_NAMESPACE "/" "accounts"
-
-/* per-account data */
-#define MODEST_ACCOUNT_DISPLAY_NAME    "display_name"                  /* string */
-#define MODEST_ACCOUNT_DEFAULT         "default"                       /* bool */
-
-/* "transport" or "store" */
-
-#define MODEST_ACCOUNT_TYPE            "type"                      /* string */
-#define MODEST_ACCOUNT_TYPE_STORE      "store"
-#define MODEST_ACCOUNT_TYPE_TRANSPORT  "transport"
-
-
-#define MODEST_ACCOUNT_PROTO           "proto"          /* string */
-#define MODEST_ACCOUNT_PROTO_POP       "pop"            /* string */
-#define MODEST_ACCOUNT_PROTO_IMAP      "imap"           /* string */
-
-
-#define MODEST_ACCOUNT_PASSWORD        "password"       /* string */
-#define MODEST_ACCOUNT_SERVER          "server"                 /* string */
-#define MODEST_ACCOUNT_USER            "user"           /* string */
-
-#define MODEST_ACCOUNT_LEAVE_ON_SERVER       "leave_on_server"          /* boolean */ \
-#define MODEST_ACCOUNT_PREFERRED_CNX         "preferred_cnx"            /* string */
-
-#endif /*__MODEST_CONF_KEYS_H__*/
diff --git a/experimental/modest/src/modest-account-mgr.c b/experimental/modest/src/modest-account-mgr.c
deleted file mode 100644 (file)
index 7034de9..0000000
+++ /dev/null
@@ -1,375 +0,0 @@
-/* modest-account-mgr.c */
-
-/* insert (c)/licensing information) */
-
-#include <string.h>
-#include "modest-account-mgr.h"
-
-/* 'private'/'protected' functions */
-static void    modest_account_mgr_class_init    (ModestAccountMgrClass *klass);
-static void    modest_account_mgr_init          (ModestAccountMgr *obj);
-static void    modest_account_mgr_finalize      (GObject *obj);
-
-static gchar*  get_account_keyname (const gchar *accname, const gchar *name);
-
-
-/* list my signals */
-enum {
-       /* MY_SIGNAL_1, */
-       /* MY_SIGNAL_2, */
-       LAST_SIGNAL
-};
-
-typedef struct _ModestAccountMgrPrivate ModestAccountMgrPrivate;
-struct _ModestAccountMgrPrivate {
-       ModestConf *modest_conf;
-};
-#define MODEST_ACCOUNT_MGR_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
-                                                MODEST_TYPE_ACCOUNT_MGR, \
-                                                ModestAccountMgrPrivate))
-/* globals */
-static GObjectClass *parent_class = NULL;
-
-/* uncomment the following if you have defined any signals */
-/* static guint signals[LAST_SIGNAL] = {0}; */
-
-GType
-modest_account_mgr_get_type (void)
-{
-       static GType my_type = 0;
-       if (!my_type) {
-               static const GTypeInfo my_info = {
-                       sizeof(ModestAccountMgrClass),
-                       NULL,           /* base init */
-                       NULL,           /* base finalize */
-                       (GClassInitFunc) modest_account_mgr_class_init,
-                       NULL,           /* class finalize */
-                       NULL,           /* class data */
-                       sizeof(ModestAccountMgr),
-                       1,              /* n_preallocs */
-                       (GInstanceInitFunc) modest_account_mgr_init,
-               };
-
-               my_type = g_type_register_static (G_TYPE_OBJECT,
-                                                 "ModestAccountMgr",
-                                                 &my_info, 0);
-       }
-       return my_type;
-}
-
-static void
-modest_account_mgr_class_init (ModestAccountMgrClass *klass)
-{
-       GObjectClass *gobject_class;
-       gobject_class = (GObjectClass*) klass;
-
-       parent_class            = g_type_class_peek_parent (klass);
-       gobject_class->finalize = modest_account_mgr_finalize;
-
-       g_type_class_add_private (gobject_class, sizeof(ModestAccountMgrPrivate));
-
-       /* signal definitions go here, e.g.: */
-/*     signals[MY_SIGNAL_1] = */
-/*             g_signal_new ("my_signal_1",....); */
-/*     signals[MY_SIGNAL_2] = */
-/*             g_signal_new ("my_signal_2",....); */
-/*     etc. */
-}
-
-
-static void
-modest_account_mgr_init (ModestAccountMgr *obj)
-{
-       ModestAccountMgrPrivate *priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(obj);
-       priv->modest_conf = NULL;       
-}
-
-static void
-modest_account_mgr_finalize (GObject *obj)
-{
-       ModestAccountMgr *self = MODEST_ACCOUNT_MGR(obj);
-       ModestAccountMgrPrivate *priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
-
-       g_object_unref (G_OBJECT(priv->modest_conf));
-       priv->modest_conf = NULL;
-}
-
-GObject*
-modest_account_mgr_new (ModestConf *conf)
-{
-       GObject *obj;
-       ModestAccountMgrPrivate *priv;
-       
-       g_return_val_if_fail (conf, NULL);
-
-       obj  = G_OBJECT(g_object_new(MODEST_TYPE_ACCOUNT_MGR, NULL));
-       priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(obj);
-
-       /*
-        * increase the ref count on the modest_conf. Normally, the
-        * ModestConf should outlive the ModestAccountMgr though
-        */
-       g_object_ref(G_OBJECT(priv->modest_conf = conf));
-       return obj;
-}
-
-
-
-gboolean
-modest_account_mgr_add_account (ModestAccountMgr *self, const gchar* name,
-                       GError **err)
-{
-       ModestAccountMgrPrivate *priv;
-       gchar *key;
-       gboolean retval;
-       
-       g_return_val_if_fail (self, FALSE);
-       g_return_val_if_fail (name, FALSE);
-       
-       if (modest_account_mgr_account_exists (self, name, err)) {
-               g_warning ("account already exists");
-               return FALSE;
-       }
-       /*
-        * we create the account by adding an account 'dir', with the name <name>,
-        * and in that the 'display_name' string key
-        */
-       key = get_account_keyname (name, "display_name");
-       
-       priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
-       retval = modest_conf_set_string (priv->modest_conf, key, name, err);
-
-       g_free (key);
-       return retval;
-}
-
-       
-gboolean
-modest_account_mgr_remove_account (ModestAccountMgr *self, const gchar* name,
-                          GError **err)
-{
-       ModestAccountMgrPrivate *priv;
-       gchar *key;
-       gboolean retval;
-       
-       g_return_val_if_fail (self, FALSE);
-       g_return_val_if_fail (name, FALSE);
-
-       if (!modest_account_mgr_account_exists (self, name, err)) {
-               g_warning ("account doest not exist");
-               return FALSE;
-       }
-       
-       priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);    
-       key = get_account_keyname (name, NULL);
-       
-       retval = modest_conf_remove_key (priv->modest_conf, key, NULL); 
-
-       g_free (key);
-       return retval;
-}
-
-
-
-GSList*
-modest_account_mgr_account_names  (ModestAccountMgr *self, GError **err)
-{
-       GSList *accounts, *cursor;
-       ModestAccountMgrPrivate *priv;
-       
-       g_return_val_if_fail (self, NULL);
-       
-       priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
-
-       cursor = accounts = modest_conf_list_subkeys (priv->modest_conf,
-                                                     MODEST_ACCOUNT_NAMESPACE,
-                                                     err);
-       while (cursor) {
-               gchar *account = cursor->data;
-               cursor->data = g_strdup (account +
-                                        strlen(MODEST_ACCOUNT_NAMESPACE "/"));
-               g_free (account);
-               cursor = cursor->next;
-       }
-       return accounts;
-}
-
-
-
-
-gchar*
-modest_account_mgr_get_account_string (ModestAccountMgr *self, const gchar *name,
-                                      const gchar *key, GError **err)
-{
-       ModestAccountMgrPrivate *priv;
-
-       gchar *keyname;
-       gchar *retval;
-
-       g_return_val_if_fail (self, NULL);
-       g_return_val_if_fail (name, NULL);
-       g_return_val_if_fail (key, NULL);
-
-       keyname = get_account_keyname (name, key);
-       g_warning ("get key: %s", keyname);
-       
-       priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
-       
-       retval = modest_conf_get_string (priv->modest_conf,
-                                        keyname, err);
-       
-       g_free (keyname);
-       return retval;
-}
-
-
-
-gint
-modest_account_mgr_get_account_int (ModestAccountMgr *self, const gchar *name,
-                                   const gchar *key, GError **err)
-{
-       ModestAccountMgrPrivate *priv;
-
-       gchar *keyname;
-       gint retval;
-
-       g_return_val_if_fail (self, -1);
-       g_return_val_if_fail (name, -1);
-       g_return_val_if_fail (key, -1);
-
-       keyname = get_account_keyname (name, key);
-       priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
-       retval = modest_conf_get_int (priv->modest_conf,keyname,err);
-
-       g_free (keyname);
-       return retval;
-}
-
-       
-gboolean modest_account_mgr_get_account_bool (ModestAccountMgr *self, const gchar *name,
-                                             const gchar *key, GError **err)
-{
-       ModestAccountMgrPrivate *priv;
-
-       gchar *keyname;
-       gboolean retval;
-
-       g_return_val_if_fail (self, FALSE);
-       g_return_val_if_fail (name, FALSE);
-       g_return_val_if_fail (key, FALSE);
-
-       keyname = get_account_keyname (name, key);
-       priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
-       retval = modest_conf_get_bool (priv->modest_conf,keyname,err);
-
-       g_free (keyname);
-       return retval;
-}
-       
-
-
-gboolean
-modest_account_mgr_set_account_string  (ModestAccountMgr *self, const gchar *name,
-                                       const gchar *key, const gchar* val,
-                                       GError **err)
-{
-       ModestAccountMgrPrivate *priv;
-
-       gchar *keyname;
-       gboolean retval;
-
-       g_return_val_if_fail (self, FALSE);
-       g_return_val_if_fail (name, FALSE);
-       g_return_val_if_fail (key, FALSE);
-
-       keyname = get_account_keyname (name, key);
-       priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
-       retval = modest_conf_set_string (priv->modest_conf,keyname,val,err);
-
-       g_free (keyname);
-       return retval;
-}
-
-
-
-gboolean
-modest_account_mgr_set_account_int  (ModestAccountMgr *self, const gchar *name,
-                                    const gchar *key, gint val, GError **err)
-{
-       ModestAccountMgrPrivate *priv;
-       
-       gchar *keyname;
-       gboolean retval;
-
-       g_return_val_if_fail (self, -1);
-       g_return_val_if_fail (name, -1);
-       g_return_val_if_fail (key, -1);
-
-       keyname = get_account_keyname (name, key);
-       priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
-       retval = modest_conf_set_int (priv->modest_conf,keyname,val,err);
-
-       g_free (keyname);
-       return retval;
-}
-
-
-
-
-gboolean
-modest_account_mgr_set_account_bool  (ModestAccountMgr *self, const gchar *name,
-                                     const gchar *key, gboolean val, GError **err)
-{
-       ModestAccountMgrPrivate *priv;
-       
-       gchar *keyname;
-       gboolean retval;
-
-       g_return_val_if_fail (self, FALSE);
-       g_return_val_if_fail (name, FALSE);
-       g_return_val_if_fail (key, FALSE);
-
-       keyname = get_account_keyname (name, key);
-       priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
-       retval = modest_conf_set_bool (priv->modest_conf,keyname,val,err);
-
-       g_free (keyname);
-       return retval;
-}
-
-
-gboolean
-modest_account_mgr_account_exists (ModestAccountMgr *self, const gchar *name,
-                                  GError **err)
-{
-       ModestAccountMgrPrivate *priv;
-       
-       gchar *keyname;
-       gboolean retval;
-
-       g_return_val_if_fail (self, FALSE);
-       g_return_val_if_fail (name, FALSE);
-       
-       keyname = get_account_keyname (name, NULL);
-       
-       priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
-       retval = modest_conf_key_exists (priv->modest_conf,keyname,err);
-
-       g_free (keyname);
-       return retval;
-}
-
-
-
-/* must be freed by caller */
-static gchar*
-get_account_keyname (const gchar *accname, const gchar *name)
-{
-       if (name)
-               return g_strconcat
-                       (MODEST_ACCOUNT_NAMESPACE, "/", accname, "/", name, NULL);
-       else
-               return g_strconcat
-                       (MODEST_ACCOUNT_NAMESPACE, "/", accname, NULL);
-}
-
diff --git a/experimental/modest/src/modest-account-mgr.h b/experimental/modest/src/modest-account-mgr.h
deleted file mode 100644 (file)
index 3dc6250..0000000
+++ /dev/null
@@ -1,220 +0,0 @@
-/* modest-account-mgr.h */
-/* insert (c)/licensing information) */
-
-#ifndef __MODEST_ACCOUNT_MGR_H__
-#define __MODEST_ACCOUNT_MGR_H__
-
-#include <glib-object.h>
-#include "modest-conf.h"
-#include "modest-account-keys.h"
-
-G_BEGIN_DECLS
-
-/* convenience macros */
-#define MODEST_TYPE_ACCOUNT_MGR             (modest_account_mgr_get_type())
-#define MODEST_ACCOUNT_MGR(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj),MODEST_TYPE_ACCOUNT_MGR,ModestAccountMgr))
-#define MODEST_ACCOUNT_MGR_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass),MODEST_TYPE_ACCOUNT_MGR,GObject))
-#define MODEST_IS_ACCOUNT_MGR(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj),MODEST_TYPE_ACCOUNT_MGR))
-#define MODEST_IS_ACCOUNT_MGR_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass),MODEST_TYPE_ACCOUNT_MGR))
-#define MODEST_ACCOUNT_MGR_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj),MODEST_TYPE_ACCOUNT_MGR,ModestAccountMgrClass))
-
-typedef struct _ModestAccountMgr      ModestAccountMgr;
-typedef struct _ModestAccountMgrClass ModestAccountMgrClass;
-
-struct _ModestAccountMgr {
-        GObject parent;
-       /* insert public members, if any */
-};
-
-struct _ModestAccountMgrClass {
-       GObjectClass parent_class;
-       /* insert signal callback declarations, eg. */
-       /* void (* my_event) (ModestAccountMgr* obj); */
-};
-
-
-/**
- * modest_ui_get_type:
- * 
- * get the GType for ModestAccountMgr
- *  
- * Returns: the GType
- */
-GType           modest_account_mgr_get_type       (void) G_GNUC_CONST;
-
-
-/**
- * modest_account_mgr_new:
- * @modest_conf: a ModestConf instance 
- *  
- * Returns: a new ModestAccountMgr, or NULL in case of error
- */
-GObject*        modest_account_mgr_new            (ModestConf *modest_conf);
-
-
-/**
- * modest_account_mgr_add_account:
- * @self: a ModestAccountMgr instance
- * @name: the name of the account to create
- * @err: a GError ptr, or NULL to ignore.
- * 
- * create a new account. the account with @name should not already exist
- *
- * Returns: TRUE if the creation succeeded, FALSE otherwise,
- * @err gives details in case of error
- */
-gboolean        modest_account_mgr_add_account    (ModestAccountMgr *self, const gchar* name,
-                                                  GError **err);
-
-/**
- * modest_account_mgr_remove_account:
- * @self: a ModestAccountMgr instance
- * @name: the name of the account to remove
- * @err: a GError ptr, or NULL to ignore.
- * 
- * remove an existing account. the account with @name should already exist
- *
- * Returns: TRUE if the creation succeeded, FALSE otherwise,
- * @err gives details in case of error
- */
-gboolean        modest_account_mgr_remove_account         (ModestAccountMgr *self, const gchar* name,
-                                                          GError **err);
-/**
- * modest_account_mgr_account_names:
- * @self: a ModestAccountMgr instance
- * @err: a GError ptr, or NULL to ignore.
- * 
- * list all account names
- *
- * Returns: a newly allocated list of account names, or NULL in case of error or
- * if there are no accounts. The caller must free the returned GSList
- * @err gives details in case of error
- */
-GSList*                modest_account_mgr_account_names          (ModestAccountMgr *self, GError **err);
-
-
-/**
- * modest_account_mgr_account_exists:
- * @self: a ModestAccountMgr instance
- * @err: a GError ptr, or NULL to ignore.
- * 
- * check whether account @name exists
- *
- * Returns: TRUE if the account exists, FALSE otherwise (or in case of error)
- * @err gives details in case of error
- */
-gboolean       modest_account_mgr_account_exists         (ModestAccountMgr *self,
-                                                          const gchar *name,
-                                                          GError **err);
-
-/* account specific functions */
-
-
-
-/**
- * modest_account_mgr_get_account_string:
- * @self: self a ModestAccountMgr instance
- * @name: the name of the account
- * @key: the key of the value to retrieve
- * @err: a GError ptr, or NULL to ignore.
- * 
- * get a config string from some account
- *
- * Returns: a newly allocated string with the value for the key,
- * or NULL in case of error. @err gives details in case of error
- */
-gchar*         modest_account_mgr_get_account_string     (ModestAccountMgr *self,
-                                                          const gchar *name,
-                                                          const gchar *key, GError **err);
-/**
- * modest_account_mgr_get_account_int:
- * @self: self a ModestAccountMgr instance
- * @name: the name of the account
- * @key: the key of the value to retrieve
- * @err: a GError ptr, or NULL to ignore.
- * 
- * get a config int from some account
- *
- * Returns: an integer with the value for the key, or -1 in case of
- * error (but of course -1 does not necessarily imply an error)
- * @err gives details in case of error
- */
-gint           modest_account_mgr_get_account_int        (ModestAccountMgr *self,
-                                                          const gchar *name,
-                                                          const gchar *key, GError **err);
-
-
-/**
- * modest_account_mgr_get_account_bool:
- * @self: self a ModestAccountMgr instance
- * @name: the name of the account
- * @key: the key of the value to retrieve
- * @err: a GError ptr, or NULL to ignore.
- * 
- * get a config boolean from some account
- *
- * Returns: an boolean with the value for the key, or FALSE in case of
- * error (but of course FALSE does not necessarily imply an error)
- * @err gives details in case of error
- */
-gboolean       modest_account_mgr_get_account_bool       (ModestAccountMgr *self,
-                                                          const gchar *name,
-                                                          const gchar *key, GError **err);
-
-
-/**
- * modest_account_mgr_set_account_string:
- * @self: self a ModestAccountMgr instance
- * @name: the name of the account
- * @key: the key of the value to set
- * @val: the value to set
- * @err: a GError ptr, or NULL to ignore.
- * 
- * set a config string for some account
- *
- * Returns: TRUE if setting the value succeeded, or FALSE in case of error.
- * @err gives details in case of error
- */
-gboolean       modest_account_mgr_set_account_string     (ModestAccountMgr *self,
-                                                          const gchar *name,
-                                                          const gchar *key, const gchar* val,
-                                                          GError **err);
-/**
- * modest_account_mgr_set_account_int:
- * @self: self a ModestAccountMgr instance
- * @name: the name of the account
- * @key: the key of the value to set
- * @val: the value to set
- * @err: a GError ptr, or NULL to ignore.
- * 
- * set a config int for some account
- *
- * Returns: TRUE if setting the value succeeded, or FALSE in case of error.
- * @err gives details in case of error
- */
-gboolean       modest_account_mgr_set_account_int        (ModestAccountMgr *self,
-                                                          const gchar *name,
-                                                          const gchar *key, gint val,
-                                                          GError **err);
-
-/**
- * modest_account_mgr_set_account_bool:
- * @self: self a ModestAccountMgr instance
- * @name: the name of the account
- * @key: the key of the value to set
- * @val: the value to set
- * @err: a GError ptr, or NULL to ignore.
- * 
- * set a config bool for some account
- *
- * Returns: TRUE if setting the value succeeded, or FALSE in case of error.
- * @err gives details in case of error
- */
-gboolean       modest_account_mgr_set_account_bool       (ModestAccountMgr *self,
-                                                          const gchar *name,
-                                                          const gchar *key, gboolean val,
-                                                          GError **err);
-G_END_DECLS
-
-#endif /* __MODEST_ACCOUNT_MGR_H__ */
-
diff --git a/experimental/modest/src/modest-conf-gconf.c b/experimental/modest/src/modest-conf-gconf.c
deleted file mode 100644 (file)
index e2fe5e9..0000000
+++ /dev/null
@@ -1,319 +0,0 @@
-/* modest-conf-gconf.c */
-/* GConf implementation of ModestConf */
-
-/* insert (c)/licensing information) */
-
-#include "modest-conf.h"
-#include <gconf/gconf-client.h>
-
-
-/* 'private'/'protected' functions */
-static void   modest_conf_class_init     (ModestConfClass *klass);
-static void   modest_conf_init           (ModestConf *obj);
-static void   modest_conf_finalize       (GObject *obj);
-
-static void   modest_conf_on_change     (GConfClient *client, guint conn_id,
-                                         GConfEntry *entry, gpointer data);
-/* list my signals */
-enum {
-       /* MY_SIGNAL_1, */
-       /* MY_SIGNAL_2, */
-       LAST_SIGNAL
-};
-
-typedef struct _ModestConfPrivate ModestConfPrivate;
-struct _ModestConfPrivate {
-       GConfClient *gconf_client;
-};
-#define MODEST_CONF_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
-                                         MODEST_TYPE_CONF, \
-                                         ModestConfPrivate))
-/* globals */
-static GObjectClass *parent_class = NULL;
-
-/* uncomment the following if you have defined any signals */
-/* static guint signals[LAST_SIGNAL] = {0}; */
-
-GType
-modest_conf_get_type (void)
-{
-       static GType my_type = 0;
-       if (!my_type) {
-               static const GTypeInfo my_info = {
-                       sizeof(ModestConfClass),
-                       NULL,           /* base init */
-                       NULL,           /* base finalize */
-                       (GClassInitFunc) modest_conf_class_init,
-                       NULL,           /* class finalize */
-                       NULL,           /* class data */
-                       sizeof(ModestConf),
-                       1,              /* n_preallocs */
-                       (GInstanceInitFunc) modest_conf_init,
-               };
-               my_type = g_type_register_static (G_TYPE_OBJECT,
-                                                 "ModestConf",
-                                                 &my_info, 0);
-       }
-       return my_type;
-}
-
-static void
-modest_conf_class_init (ModestConfClass *klass)
-{
-       GObjectClass *gobject_class;
-       gobject_class = (GObjectClass*) klass;
-
-       parent_class            = g_type_class_peek_parent (klass);
-       gobject_class->finalize = modest_conf_finalize;
-
-       g_type_class_add_private (gobject_class, sizeof(ModestConfPrivate));
-
-       /* signal definitions go here, e.g.: */
-/*     signals[MY_SIGNAL_1] = */
-/*             g_signal_new ("my_signal_1",....); */
-/*     signals[MY_SIGNAL_2] = */
-/*             g_signal_new ("my_signal_2",....); */
-/*     etc. */
-}
-
-static void
-modest_conf_init (ModestConf *obj)
-{
-       GConfClient *conf = NULL;
-       ModestConfPrivate *priv = MODEST_CONF_GET_PRIVATE(obj);
-       GError *err      = NULL;
-       
-       priv->gconf_client = NULL;
-       
-       conf = gconf_client_get_default ();
-       if (!conf) {
-               g_warning ("could not get gconf client");
-               return;
-       }
-
-       /* FIXME: is PRELOAD_NONE the most efficient? */
-       gconf_client_add_dir (conf,MODEST_CONF_NAMESPACE,
-                             GCONF_CLIENT_PRELOAD_NONE,&err);
-       if (err) {
-               g_warning ("error with gconf_client_add_dir: %d:%s",
-                          err->code, err->message);
-               g_object_unref (conf);
-               g_error_free (err);
-               return;
-       }
-
-       gconf_client_notify_add (conf, MODEST_CONF_NAMESPACE,
-                                modest_conf_on_change,
-                                obj, NULL, &err);
-       if (err) {
-               g_warning ("error with gconf_client_notify_add: %d:%s",
-                          err->code, err->message);
-               g_object_unref (conf);
-               g_error_free (err);
-               return;
-       }
-
-       /* all went well! */
-       priv->gconf_client = conf;
-       return;
-}
-
-static void
-modest_conf_finalize (GObject *obj)
-{
-       ModestConfPrivate *priv = MODEST_CONF_GET_PRIVATE(obj);
-       if (priv->gconf_client) {
-               gconf_client_suggest_sync (priv->gconf_client, NULL);
-               g_object_unref (priv->gconf_client);
-       }       
-}
-
-GObject*
-modest_conf_new (void)
-{
-       ModestConf *conf = MODEST_CONF(g_object_new(MODEST_TYPE_CONF, NULL));
-       if (!conf) {
-               g_warning ("failed to init ModestConf (GConf)");
-               return NULL;
-       }
-
-       ModestConfPrivate *priv = MODEST_CONF_GET_PRIVATE(conf);
-       if (!priv->gconf_client) {
-               g_warning ("failed to init gconf");
-               g_object_unref (conf);
-               return NULL;
-       }
-       
-       return G_OBJECT(conf);
-}
-
-
-gchar*
-modest_conf_get_string (ModestConf* self, const gchar* key, GError **err)
-{
-       ModestConfPrivate *priv;
-       gchar *retval = NULL;
-       
-       g_return_val_if_fail (self, NULL);
-       g_return_val_if_fail (key,  NULL);
-
-       priv = MODEST_CONF_GET_PRIVATE(self);
-       return gconf_client_get_string (priv->gconf_client, key, err);
-}
-
-
-gint
-modest_conf_get_int (ModestConf* self, const gchar* key, GError **err)
-{
-       ModestConfPrivate *priv;
-       gint retval = -1;
-
-       g_return_val_if_fail (self, -1);
-       g_return_val_if_fail (key, -1);
-
-       priv = MODEST_CONF_GET_PRIVATE(self);
-       
-       return gconf_client_get_int (priv->gconf_client, key, err);
-}
-
-
-gboolean
-modest_conf_get_bool (ModestConf* self, const gchar* key, GError **err)
-{
-       ModestConfPrivate *priv;
-       gint retval = -1;
-
-       g_return_val_if_fail (self, FALSE);
-       g_return_val_if_fail (key, FALSE);
-
-       priv = MODEST_CONF_GET_PRIVATE(self);
-       
-       return gconf_client_get_bool (priv->gconf_client, key, err);
-}
-
-
-gboolean
-modest_conf_set_string (ModestConf* self, const gchar* key, const gchar* val,
-                       GError **err)
-{
-       ModestConfPrivate *priv;
-               
-       g_return_val_if_fail (self,FALSE);
-       g_return_val_if_fail (key, FALSE);
-       
-       priv = MODEST_CONF_GET_PRIVATE(self);
-
-       if (!gconf_client_key_is_writable(priv->gconf_client,key,err)) {
-               g_warning ("'%s' is not writable", key);
-               return FALSE;
-       }
-                       
-       return gconf_client_set_string (priv->gconf_client, key, val, err);     
-}
-
-
-gboolean
-modest_conf_set_int  (ModestConf* self, const gchar* key, gint val,
-                     GError **err)
-{
-       ModestConfPrivate *priv;
-               
-       g_return_val_if_fail (self,FALSE);
-       g_return_val_if_fail (key, FALSE);
-       
-       priv = MODEST_CONF_GET_PRIVATE(self);
-
-       if (!gconf_client_key_is_writable(priv->gconf_client,key,err)) {
-               g_warning ("'%s' is not writable", key);
-               return FALSE;
-       }
-                       
-       return gconf_client_set_int (priv->gconf_client, key, val, err);        
-}
-
-
-gboolean
-modest_conf_set_bool (ModestConf* self, const gchar* key, gboolean val,
-                     GError **err)
-{
-       ModestConfPrivate *priv;
-               
-       g_return_val_if_fail (self,FALSE);
-       g_return_val_if_fail (key, FALSE);
-       
-       priv = MODEST_CONF_GET_PRIVATE(self);
-
-       if (!gconf_client_key_is_writable(priv->gconf_client,key, err)) {
-               g_warning ("'%s' is not writable", key);
-               return FALSE;
-       }
-                       
-       return gconf_client_set_bool (priv->gconf_client,key,val, err);
-}
-
-
-
-
-GSList*
-modest_conf_list_subkeys (ModestConf* self, const gchar* key, GError **err)
-{
-       ModestConfPrivate *priv;
-               
-       g_return_val_if_fail (self,FALSE);
-       g_return_val_if_fail (key, FALSE);
-       
-       priv = MODEST_CONF_GET_PRIVATE(self);
-                       
-       return gconf_client_all_dirs (priv->gconf_client,key,err);
-}
-
-
-gboolean
-modest_conf_remove_key (ModestConf* self, const gchar* key, GError **err)
-{
-       ModestConfPrivate *priv;
-               
-       g_return_val_if_fail (self,FALSE);
-       g_return_val_if_fail (key, FALSE);
-       
-       priv = MODEST_CONF_GET_PRIVATE(self);
-                       
-       return gconf_client_recursive_unset (priv->gconf_client,key,0,err);
-}
-
-
-
-
-gboolean
-modest_conf_key_exists (ModestConf* self, const gchar* key, GError **err)
-{
-       ModestConfPrivate *priv;
-       
-       g_return_val_if_fail (self,FALSE);
-       g_return_val_if_fail (key, FALSE);
-       
-       priv = MODEST_CONF_GET_PRIVATE(self);
-                       
-       return gconf_client_dir_exists (priv->gconf_client,key,err);
-}
-
-
-
-
-
-static void
-modest_conf_on_change (GConfClient *client, guint conn_id, GConfEntry *entry,
-                       gpointer data)
-{
-       /* FIXME: emit a signal here */
-
-       if (!entry->value)
-               g_print ("modest: key '%s' unset\n",
-                        gconf_entry_get_key (entry));
-       else {
-               gchar *val = gconf_value_to_string (gconf_entry_get_value(entry));
-               g_print ("modest: key '%s' set to '%s'\n",
-                        gconf_entry_get_key (entry), val);
-               g_free (val);
-       }
-}
diff --git a/experimental/modest/src/modest-conf-keys.h b/experimental/modest/src/modest-conf-keys.h
deleted file mode 100644 (file)
index 0c71662..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef __MODEST_CONF_KEYS_H__
-#define __MODEST_CONF_KEYS_H__
-
-/* configuration key definitions for modest */
-#define MODEST_CONF_NAMESPACE          "/apps/modest"
-
-#define MODEST_CONF_USE_EXT_EDITOR       MODEST_CONF_NAMESPACE "/use_ext_editor"         /* boolean */
-#define MODEST_CONF_EXT_EDITOR           MODEST_CONF_NAMESPACE "/ext_editor"     /* string */
-
-#define MODEST_CONF_MAIN_WINDOW_HEIGHT   MODEST_CONF_NAMESPACE "/main_window_height"    /* int */
-#define MODEST_CONF_MAIN_WINDOW_HEIGHT_DEFAULT 800                                       /* int */
-
-#define MODEST_CONF_MAIN_WINDOW_WIDTH    MODEST_CONF_NAMESPACE "/main_window_width"     /* int */
-#define MODEST_CONF_MAIN_WINDOW_WIDTH_DEFAULT  480
-
-#define MODEST_CONF_EDIT_WINDOW_HEIGHT   MODEST_CONF_NAMESPACE "/edit_window_height"    /* int */
-#define MODEST_CONF_EDIT_WINDOW_HEIGHT_DEFAULT 800                                       /* int */
-
-#define MODEST_CONF_EDIT_WINDOW_WIDTH    MODEST_CONF_NAMESPACE "/edit_window_width"     /* int */
-#define MODEST_CONF_EDIT_WINDOW_WIDTH_DEFAULT  480
-
-
-
-
-
-#endif /*__MODEST_CONF_KEYS_H__*/
diff --git a/experimental/modest/src/modest-conf.h b/experimental/modest/src/modest-conf.h
deleted file mode 100644 (file)
index 16cf275..0000000
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * modest-conf.h
- */
-
-#ifndef __MODEST_CONF_H__
-#define __MODEST_CONF_H__
-
-#include <glib-object.h>
-#include "modest-conf-keys.h"
-
-G_BEGIN_DECLS
-
-/* convenience macros */
-#define MODEST_TYPE_CONF             (modest_conf_get_type())
-#define MODEST_CONF(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj),MODEST_TYPE_CONF,ModestConf))
-#define MODEST_CONF_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass),MODEST_TYPE_CONF,GObject))
-#define MODEST_IS_CONF(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj),MODEST_TYPE_CONF))
-#define MODEST_IS_CONF_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass),MODEST_TYPE_CONF))
-#define MODEST_CONF_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj),MODEST_TYPE_CONF,ModestConfClass))
-
-typedef struct _ModestConf      ModestConf;
-typedef struct _ModestConfClass ModestConfClass;
-
-struct _ModestConf {
-        GObject parent;
-};
-
-struct _ModestConfClass {
-       GObjectClass parent_class;
-       /* insert signal callback declarations, eg. */
-       /* void (* my_event) (ModestConf* obj); */
-};
-
-
-/**
- * modest_conf_get_type:
- * 
- * get the GType for ModestConf
- *  
- * Returns: the GType
- */
-GType        modest_conf_get_type    (void) G_GNUC_CONST;
-
-
-/**
- * modest_conf_new:
- * 
- * create a new modest ModestConf object. 
- * 
- * Returns: a new ModestConf instance, or NULL in case
- * of any error
- */
-GObject*     modest_conf_new         (void);
-
-
-/**
- * modest_conf_get_string:
- * @self: self a ModestConf instance
- * @key: the key of the value to retrieve
- * @err: a GError ptr, or NULL to ignore.
- * 
- * get a string from the configuration system
- *
- * Returns: a newly allocated string with the value for the key,
- * or NULL in case of error. @err gives details in case of error
- */
-gchar*       modest_conf_get_string  (ModestConf* self, const gchar* key, GError **err);
-
-
-/** 
- * modest_conf_get_int:
- * @self: self a ModestConf instance
- * @key: the key of the value to retrieve
- * @err: a GError ptr, or NULL to ignore.
- * 
- * get an integer from the configuration system
- *  
- * Returns: an integer with the value for the key, or -1 in case of error
- * (of course, -1 can also be returned in non-error cases).
- * @err gives details in case of error
- */
-int          modest_conf_get_int     (ModestConf* self, const gchar* key, GError **err);
-
-
-/** 
- * modest_conf_get_bool:
- * @self: self a ModestConf instance
- * @key: the key of the value to retrieve
- * @err: a GError ptr, or NULL to ignore.
- * 
- * get a boolean value from the configuration system
- *  
- * Returns: a boolean value with the value for the key, or -1 in case of error
- * (of course, -1 can also be returned in non-error cases).
- * @err gives details in case of error
- */
-gboolean     modest_conf_get_bool    (ModestConf* self, const gchar* key, GError **err);
-
-
-/**
- * modest_conf_set_string:
- * @self: a ModestConf instance
- * @key: the key of the value to set
- * @val: the value to set
- * @err: a GError ptr, or NULL if not interested.
- *
- * store a string value in the configuration system
- * 
- * Returns: TRUE if succeeded or FALSE in case of error.
- * @err gives details in case of error
- */
-gboolean     modest_conf_set_string (ModestConf* self, const gchar* key, const gchar *val,
-                                    GError **err);
-
-/**
- * modest_conf_set_int:
- * @self: a ModestConf instance
- * @key: the key of the value to set
- * @val: the value to set
- * @err: a GError ptr, or NULL if not interested.
- *
- * store an integer value in the configuration system
- * 
- * Returns: TRUE if succeeded or FALSE in case of error.
- * @err gives details in case of error
- */
-gboolean     modest_conf_set_int    (ModestConf* self, const gchar* key, int val,
-                                    GError **err);
-
-/**
- * modest_conf_set_bool:
- * @self: a ModestConf instance
- * @key: the key of the value to set
- * @val: the value to set
- * @err: a GError ptr, or NULL if not interested.
- *
- * store a boolean value in the configuration system
- * 
- * Returns: TRUE if succeeded or FALSE in case of error.
- * @err gives details in case of error
- */
-gboolean     modest_conf_set_bool    (ModestConf* self, const gchar* key, gboolean val,
-                                     GError **err);
-
-
-/**
- * modest_conf_list_subkeys:
- * @self: a ModestConf instance
- * @key: the key whose subkeys will be listed
- * @err: a GError ptr, or NULL if not interested.
- *
- * list all the subkeys for a given key
- * 
- * Returns: a newly allocated list or NULL in case of error
- * the returned GSList must be freed by the caller
- * @err gives details in case of error
- */
-GSList*     modest_conf_list_subkeys    (ModestConf* self, const gchar* key,
-                                       GError **err);
-
-
-/**
- * modest_conf_remove_key:
- * @self: a ModestConf instance
- * @key: the key to remove
- * @err: a GError ptr, or NULL if not interested.
- *
- * attempts to remove @key and all its subkeys
- * 
- * Returns: TRUE if succeeded or FALSE in case of error.
- * @err gives details in case of error
- */
-gboolean   modest_conf_remove_key    (ModestConf* self, const gchar* key, GError **err);
-
-
-/**
- * modest_conf_key_exists:
- * @self: a ModestConf instance
- * @key: the key to remove
- * @err: a GError ptr, or NULL if not interested.
- *
- * checks if the given key exists in the configuration system
- * 
- * Returns: TRUE if exists, FALSE otherwise.
- * @err gives details in case of error
- */
-gboolean   modest_conf_key_exists   (ModestConf* self, const gchar* key, GError **err);
-
-
-G_END_DECLS
-
-#endif /* __MODEST_CONF_H__ */
-
diff --git a/experimental/modest/src/modest-main.c b/experimental/modest/src/modest-main.c
deleted file mode 100644 (file)
index d6ee265..0000000
+++ /dev/null
@@ -1,200 +0,0 @@
-/* modest-main.c -- part of modest */
-#include <glib.h>
-
-#include "modest-conf.h"
-#include "modest-account-mgr.h"
-#include "modest-ui.h"
-
-#ifdef HAVE_CONFIG_H                           
-#include <config.h>
-#endif /*HAVE_CONFIG_H*/
-
-#if defined (MODEST_ENABLE_HILDON_UI) || defined (MODEST_ENABLE_GTK_UI)
-#include <gtk/gtk.h>
-#endif
-
-static void install_basic_conf_settings (ModestConf *conf);
-static void install_test_account        (ModestConf *conf);
-
-
-int
-main (int argc, char *argv[])
-{
-       GOptionContext   *context        = NULL;
-       ModestConf       *modest_conf    = NULL;
-       ModestUI         *modest_ui      = NULL;
-
-       GError *err = NULL;
-       int retval  = 0;
-       
-       static gboolean update, debug, reinstall;
-       static gchar *mailto, *subject, *bcc, *cc, *body;
-       
-       static GOptionEntry options[] = {
-               { "debug",  'd', 0, G_OPTION_ARG_NONE, &debug,
-                 "Run in debug mode" },
-               { "update", 'u', 0, G_OPTION_ARG_NONE, &update,
-                 "Send/receive all accounts and exit"},
-               { "mailto", 'm', 0, G_OPTION_ARG_STRING, &mailto,
-                 "Start writing a new email to <addresses>"},
-               { "subject", 's', 0, G_OPTION_ARG_STRING, &subject,
-                 "Subject for a new mail"},
-               { "body", 'b', 0, G_OPTION_ARG_STRING, &body,
-                 "Body for a new email"},      
-/*             { "bodyfile", 'f', 0, G_OPTION_ARG_STRING, &bodyfile, */
-/*               "Body for a new email"},       */
-               { "cc",  0, 0, G_OPTION_ARG_STRING, &cc,
-                 "CC-addresses for a new mail (comma-separated)"},             
-               { "bcc", 0, 0, G_OPTION_ARG_STRING, &bcc,
-                 "BCC-adresses for a new mail (comma-separated)"},
-/*             { "attach", 's', 0, G_OPTION_ARG_STRING, &attach, */
-/*               "Attachements for a new email (comma-separated)"}, */
-               { "reinstall-factory-settings", 0, 0, G_OPTION_ARG_NONE, &reinstall,
-                 "Delete all settings and start over (*DESTRUCTIVE*)"
-               },
-               { NULL }
-       };
-
-       g_type_init ();
-       
-       context = g_option_context_new (NULL);
-       g_option_context_add_main_entries (context, options, NULL);
-       
-       if (!g_option_context_parse (context, &argc, &argv, &err)) {
-               g_printerr ("modest: error in command line parameter(s): %s\n",
-                        err ? err->message : "");
-               retval = 1;
-               goto cleanup;
-       }
-
-       modest_conf = MODEST_CONF(modest_conf_new());
-       if (!modest_conf) {
-               g_warning ("failed to initialize config system");
-               goto cleanup;
-       }
-
-       if (reinstall) {
-               modest_conf_remove_key (modest_conf, MODEST_CONF_NAMESPACE, NULL);
-               install_basic_conf_settings (modest_conf);
-               install_test_account (modest_conf);
-               goto cleanup;
-       }
-               
-       modest_ui = MODEST_UI(modest_ui_new (modest_conf));
-       if (!modest_ui) {
-               g_warning ("failed to initialize ui");
-               goto cleanup;
-       }
-       
-#if defined (MODEST_ENABLE_HILDON_UI) || defined (MODEST_ENABLE_GTK_UI)
-       {
-               gboolean ok;
-               gtk_init (&argc, &argv);
-               
-               if (mailto||cc||bcc||subject||body)
-                       ok = modest_ui_show_edit_window (modest_ui,
-                                                        mailto,  /* to */
-                                                        cc,      /* cc */
-                                                        bcc,     /* bcc */
-                                                        subject,    /* subject */
-                                                        body,    /* body */
-                                                        NULL);   /* attachments */
-               else
-                       ok = modest_ui_show_main_window (modest_ui);
-
-               if (!ok)
-                       g_warning ("showing window failed");
-               else
-                       gtk_main();
-       }
-#else
-       /* do something else... */
-#endif
-
-       
-cleanup:
-       if (err)
-               g_error_free (err);
-
-       if (context)
-               g_option_context_free (context);
-
-       if (modest_ui)
-               g_object_unref (modest_ui);
-       
-       if (modest_conf)
-               g_object_unref (modest_conf);
-       
-       return retval;
-}
-
-
-
-static void
-install_basic_conf_settings (ModestConf *conf)
-{
-       g_return_if_fail (conf);
-
-       /* main window size */
-       modest_conf_set_int (conf, MODEST_CONF_MAIN_WINDOW_WIDTH,
-                            MODEST_CONF_MAIN_WINDOW_WIDTH_DEFAULT, NULL);
-       modest_conf_set_int (conf, MODEST_CONF_MAIN_WINDOW_HEIGHT,
-                            MODEST_CONF_MAIN_WINDOW_HEIGHT_DEFAULT, NULL);
-
-       /* edit window size */
-       modest_conf_set_int (conf, MODEST_CONF_EDIT_WINDOW_WIDTH,
-                            MODEST_CONF_EDIT_WINDOW_WIDTH_DEFAULT, NULL);
-       modest_conf_set_int (conf, MODEST_CONF_EDIT_WINDOW_HEIGHT,
-                            MODEST_CONF_EDIT_WINDOW_HEIGHT_DEFAULT, NULL);
-       
-       g_print ("modest: returned to factory settings\n");
-}
-
-
-
-static void
-install_test_account (ModestConf *conf)
-{
-       ModestAccountMgr *acc_mgr;
-       const gchar *acc_name = "test";
-       g_return_if_fail (conf);
-
-       acc_mgr = MODEST_ACCOUNT_MGR(modest_account_mgr_new (conf));
-       if (!acc_mgr) {
-               g_warning ("failed to instantiate account mgr");
-               return;
-       }
-
-       if (modest_account_mgr_account_exists (acc_mgr, acc_name, NULL)) {
-               if (!modest_account_mgr_remove_account(acc_mgr, acc_name, NULL)) {
-                       g_warning ("could not delete existing account");
-                       return;
-               }
-       }
-                                       
-       if (!modest_account_mgr_add_account (acc_mgr, acc_name, NULL))
-               g_warning ("failed to add test account");
-
-       
-       modest_account_mgr_set_account_string (acc_mgr, acc_name,
-                                              MODEST_ACCOUNT_TYPE,
-                                              MODEST_ACCOUNT_TYPE_STORE,
-                                              NULL);
-       
-       modest_account_mgr_set_account_string (acc_mgr, acc_name,
-                                              MODEST_ACCOUNT_PROTO,
-                                              MODEST_ACCOUNT_PROTO_IMAP,
-                                              NULL);
-       
-       modest_account_mgr_set_account_string (acc_mgr, acc_name,
-                                              MODEST_ACCOUNT_SERVER,
-                                              "localhost",
-                                              NULL);
-       
-       modest_account_mgr_set_account_string (acc_mgr, acc_name,
-                                              MODEST_ACCOUNT_USER,
-                                              "test",
-                                              NULL);
-
-       g_object_unref (G_OBJECT(acc_mgr));
-}
diff --git a/experimental/modest/src/modest-tny-account-store.c b/experimental/modest/src/modest-tny-account-store.c
deleted file mode 100644 (file)
index 95d927c..0000000
+++ /dev/null
@@ -1,460 +0,0 @@
-/* modest-tny-account-store.c */
-
-/* insert (c)/licensing information) */
-
-#include <string.h>
-
-#include <tny-account-store-iface.h>
-#include <tny-account-iface.h>
-#include <tny-account-store-iface.h>
-
-#include <tny-account-iface.h>
-#include <tny-store-account-iface.h>
-#include <tny-transport-account-iface.h>
-
-#include <tny-store-account.h>
-#include <tny-transport-account.h>
-
-#include "modest-account-mgr.h"
-#include "modest-tny-account-store.h"
-
-/* 'private'/'protected' functions */
-static void modest_tny_account_store_class_init   (ModestTnyAccountStoreClass *klass);
-static void modest_tny_account_store_init         (ModestTnyAccountStore *obj);
-static void modest_tny_account_store_finalize     (GObject *obj);
-
-/* implementations for tny-account-store-iface */
-static void          modest_tny_account_store_iface_init              (gpointer g_iface, gpointer iface_data);
-
-static gboolean      modest_tny_account_store_add_store_account       (TnyAccountStoreIface *self,
-                                                                      TnyStoreAccountIface *account);
-static gboolean      modest_tny_account_store_add_transport_account   (TnyAccountStoreIface *self,
-                                                                      TnyTransportAccountIface *account);
-static const GList*  modest_tny_account_store_get_store_accounts      (TnyAccountStoreIface *iface);
-static const GList*  modest_tny_account_store_get_transport_accounts  (TnyAccountStoreIface *iface);
-
-static gboolean destroy_all_accounts (ModestTnyAccountStore *self);
-static gboolean get_all_accounts     (ModestTnyAccountStore *self);
-
-/* list my signals */
-enum {
-       /* MY_SIGNAL_1, */
-       /* MY_SIGNAL_2, */
-       LAST_SIGNAL
-};
-
-typedef struct _ModestTnyAccountStorePrivate ModestTnyAccountStorePrivate;
-struct _ModestTnyAccountStorePrivate {
-       ModestAccountMgr *modest_acc_mgr;       
-       GList       *tny_transport_accounts;
-       GList       *tny_store_accounts;
-};
-#define MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
-                                                      MODEST_TYPE_TNY_ACCOUNT_STORE, \
-                                                      ModestTnyAccountStorePrivate))
-/* globals */
-static GObjectClass *parent_class = NULL;
-
-/* uncomment the following if you have defined any signals */
-/* static guint signals[LAST_SIGNAL] = {0}; */
-
-GType
-modest_tny_account_store_get_type (void)
-{
-       static GType my_type = 0;
-       if (!my_type) {
-               static const GTypeInfo my_info = {
-                       sizeof(ModestTnyAccountStoreClass),
-                       NULL,           /* base init */
-                       NULL,           /* base finalize */
-                       (GClassInitFunc) modest_tny_account_store_class_init,
-                       NULL,           /* class finalize */
-                       NULL,           /* class data */
-                       sizeof(ModestTnyAccountStore),
-                       1,              /* n_preallocs */
-                       (GInstanceInitFunc) modest_tny_account_store_init,
-               };
-               
-               static const GInterfaceInfo iface_info = {
-                       (GInterfaceInitFunc) modest_tny_account_store_iface_init, 
-                       NULL,         /* interface_finalize */
-                       NULL          /* interface_data */
-                };
-
-                my_type = g_type_register_static (G_TYPE_OBJECT,
-                                                 "ModestTnyAccountStore", &my_info, 0);
-               
-                g_type_add_interface_static (my_type, TNY_TYPE_ACCOUNT_STORE_IFACE,
-                                            &iface_info);
-
-
-               
-       }
-       return my_type;
-}
-
-static void
-modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass)
-{
-       GObjectClass *gobject_class;
-       gobject_class = (GObjectClass*) klass;
-
-       parent_class            = g_type_class_peek_parent (klass);
-       gobject_class->finalize = modest_tny_account_store_finalize;
-
-       g_type_class_add_private (gobject_class, sizeof(ModestTnyAccountStorePrivate));
-
-       /* signal definitions go here, e.g.: */
-/*     signals[MY_SIGNAL_1] = */
-/*             g_signal_new ("my_signal_1",....); */
-/*     signals[MY_SIGNAL_2] = */
-/*             g_signal_new ("my_signal_2",....); */
-/*     etc. */
-}
-
-static void
-modest_tny_account_store_init (ModestTnyAccountStore *obj)
-{
-       ModestTnyAccountStorePrivate *priv =
-               MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(obj);
-       
-       priv->modest_acc_mgr         = NULL;
-       priv->tny_transport_accounts = NULL;
-       priv->tny_store_accounts     = NULL;
-}
-
-static void
-modest_tny_account_store_finalize (GObject *obj)
-{
-       ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(obj);
-       ModestTnyAccountStorePrivate *priv =
-               MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-       
-       if (priv->modest_acc_mgr) {
-               g_object_unref (G_OBJECT(priv->modest_acc_mgr));
-               priv->modest_acc_mgr = NULL;
-       }
-       
-       destroy_all_accounts (self);
-}
-
-GObject*
-modest_tny_account_store_new (ModestAccountMgr *modest_acc_mgr)
-{
-       GObject *obj;
-       ModestTnyAccountStorePrivate *priv;
-
-       g_return_val_if_fail (modest_acc_mgr, NULL);
-       
-       obj  = G_OBJECT(g_object_new(MODEST_TYPE_TNY_ACCOUNT_STORE, NULL));
-       
-       if (!get_all_accounts (MODEST_TNY_ACCOUNT_STORE(obj))) {
-               g_warning ("could get accounts");
-               g_object_unref (obj);
-               return NULL;
-       }
-       
-       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(obj);
-       g_object_ref(G_OBJECT(priv->modest_acc_mgr = modest_acc_mgr));
-
-       return obj;
-}
-
-
-static void
-destroy_account (gpointer account)
-{
-       g_object_unref (G_OBJECT(account));
-}
-
-
-static gboolean
-destroy_all_accounts (ModestTnyAccountStore *self)
-{
-       ModestTnyAccountStorePrivate *priv;
-
-       g_return_val_if_fail (self, FALSE);
-
-       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-       
-       /* clear up old stuff first */
-       if (priv->tny_transport_accounts) {
-               g_list_foreach (priv->tny_transport_accounts,
-                               (GFunc)destroy_account, NULL);
-               g_list_free (priv->tny_transport_accounts);
-               priv->tny_transport_accounts = NULL;
-
-       }
-       
-       if (priv->tny_store_accounts) {
-               g_list_foreach (priv->tny_store_accounts,
-                               (GFunc)destroy_account, NULL);
-               g_list_free (priv->tny_store_accounts);
-               priv->tny_store_accounts = NULL;
-       }
-
-       return TRUE;
-}
-
-
-/* FIXME: tinymail needs to change here */
-/* a gpointer arg to get_password should be enough */
-static gchar*
-get_password (TnyAccountIface *account, const gchar *prompt)
-{
-       /* don't want to create all these, but there's no other way right now */
-       ModestConf       *modest_conf;
-       ModestAccountMgr *modest_acc_mgr;
-       gchar            *pw = NULL;
-       const gchar      *account_name;
-
-       g_return_val_if_fail (account, NULL);
-
-       modest_conf    = MODEST_CONF(modest_conf_new ());
-       if (!modest_conf) {
-               g_warning ("could not create conf");
-               return NULL;
-       }
-       
-       modest_acc_mgr = MODEST_ACCOUNT_MGR(modest_account_mgr_new (modest_conf));
-       if (!modest_acc_mgr) {
-               g_object_unref (modest_conf);
-               g_warning ("could not create acc mgr");
-               return NULL;
-       }
-
-       account_name = tny_account_iface_get_id(account);
-       if (!account_name) {
-               g_object_unref (modest_acc_mgr);
-               g_object_unref (modest_conf);
-               g_warning ("could not retrieve account name");
-               return NULL;
-       }
-       
-       pw = modest_account_mgr_get_account_string (modest_acc_mgr, account_name,
-                                                   MODEST_ACCOUNT_PASSWORD, NULL);
-                                    
-       g_object_unref (G_OBJECT(modest_conf));
-       g_object_unref (G_OBJECT(modest_acc_mgr));
-       
-       return pw;
-}
-
-
-static void
-forget_password (TnyAccountIface *account)
-{
-       g_warning (__FUNCTION__);
-}
-
-
-
-static gboolean
-add_tny_account_from_account (ModestTnyAccountStore *self, const gchar* account_name)
-{
-       gchar *type, *val;
-       TnyAccountIface *account_iface = NULL; 
-       ModestTnyAccountStorePrivate *priv;
-
-       g_return_val_if_fail (self, FALSE);
-       g_return_val_if_fail (account_name, FALSE);
-       
-       priv =  MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-       
-       type = modest_account_mgr_get_account_string (priv->modest_acc_mgr,
-                                                     account_name,
-                                                     MODEST_ACCOUNT_TYPE, NULL);
-       if (!type) {
-               g_warning ("error in account %s: type not defined", account_name);
-               return FALSE;
-       }
-
-       if (strcmp (type, MODEST_ACCOUNT_TYPE_STORE) == 0) {
-               account_iface = TNY_ACCOUNT_IFACE (tny_store_account_new ());
-               priv->tny_store_accounts = g_list_append (priv->tny_store_accounts,
-                                                         account_iface);
-       
-       } else if (strcmp (type, MODEST_ACCOUNT_TYPE_TRANSPORT) == 0) {
-               account_iface = TNY_ACCOUNT_IFACE (tny_transport_account_new ());
-               priv->tny_transport_accounts = g_list_append (priv->tny_transport_accounts,
-                                                             account_iface);
-       } else {
-               g_warning ("invalid account '%s': type: '%s'", account_name, type);
-               g_free (type);
-               return FALSE;
-       }
-
-       g_free (type);
-       tny_account_iface_set_id(account_iface, account_name);  
-       
-       val = modest_account_mgr_get_account_string (priv->modest_acc_mgr, account_name,
-                                                    MODEST_ACCOUNT_PROTO,NULL);
-       tny_account_iface_set_proto(account_iface, val);
-       g_free (val);
-       
-       val = modest_account_mgr_get_account_string (priv->modest_acc_mgr, account_name,
-                                                    MODEST_ACCOUNT_SERVER,NULL);
-       tny_account_iface_set_hostname(account_iface, val);
-       g_free (val);
-
-       val = modest_account_mgr_get_account_string (priv->modest_acc_mgr, account_name,
-                                                    MODEST_ACCOUNT_USER,NULL);
-       tny_account_iface_set_user(account_iface, val); 
-       g_free (val);
-
-       tny_account_iface_set_pass_func(account_iface, get_password);   
-       tny_account_iface_set_forget_pass_func(account_iface, forget_password); 
-
-       return TRUE;
-}
-
-
-
-static gboolean
-get_all_accounts (ModestTnyAccountStore *self)
-{
-       ModestTnyAccountStorePrivate *priv;
-       GSList *account_names, *cursor;
-
-       g_return_if_fail (self);
-       
-       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-       
-       destroy_all_accounts (self);    
-       
-       cursor = account_names = modest_account_mgr_account_names (priv->modest_acc_mgr,
-                                                                  NULL);
-       while (cursor) {
-               const gchar *account_name = (const gchar*) cursor->data;
-               if (!add_tny_account_from_account (self, account_name)) {
-                       g_warning ("cannot add iface for account %s",
-                                  account_name);
-                       return FALSE;
-               }
-               cursor = cursor->next;
-       }
-       return TRUE;
-}
-
-
-
-static gboolean
-modest_tny_account_store_add_store_account  (TnyAccountStoreIface *self,
-                                            TnyStoreAccountIface *account)
-{
-       TnyAccountIface       *account_iface;
-       ModestTnyAccountStore *account_store; 
-       ModestTnyAccountStorePrivate *priv;
-
-       const gchar* account_name; 
-       const gchar *hostname, *user, *proto;
-       gboolean check;
-       
-       g_return_if_fail (self);
-       g_return_if_fail (account);
-       
-       account_iface  = TNY_ACCOUNT_IFACE(account);
-       account_store  = MODEST_TNY_ACCOUNT_STORE(self);
-       priv           = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-
-       account_name   = tny_account_iface_get_id(account_iface);
-       if (!account_name) {
-               g_warning ("failed to retrieve account name");
-               return FALSE;
-       }
-
-       if (!modest_account_mgr_add_account (priv->modest_acc_mgr, account_name, NULL)) {
-               g_warning ("failed to add account %s", account_name);
-               return FALSE;
-       }
-
-       hostname =  tny_account_iface_get_hostname(account_iface);
-       user     =  tny_account_iface_get_user(account_iface);
-       proto    =  tny_account_iface_get_proto(account_iface);
-
-       if (!hostname || !user || !proto) {
-               g_warning ("error in account data: hostname:%s; user:%s; proto:%s",
-                          hostname ? hostname : "<none>",
-                          user     ? user     : "<none>",
-                          proto    ? proto    : "<none>");
-               return FALSE;
-       }
-       
-       check = modest_account_mgr_set_account_string (priv->modest_acc_mgr,
-                                                      account_name,MODEST_ACCOUNT_SERVER,
-                                                      hostname, NULL);
-       check = check && modest_account_mgr_set_account_string (priv->modest_acc_mgr,
-                                                               account_name,MODEST_ACCOUNT_USER,
-                                                               user, NULL);
-       check = check && modest_account_mgr_set_account_string (priv->modest_acc_mgr,
-                                                               account_name, MODEST_ACCOUNT_PROTO,
-                                                               proto, NULL);
-       if (!check)
-               g_warning ("failed to set some account data");
-
-       return check;
-}
-
-
-static const GList*
-modest_tny_account_store_get_store_accounts  (TnyAccountStoreIface *iface)
-{
-       ModestTnyAccountStore *self;
-       ModestTnyAccountStorePrivate *priv;
-
-       g_return_val_if_fail (iface, NULL);
-       
-       self = MODEST_TNY_ACCOUNT_STORE(iface);
-       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-       
-       if (!priv->tny_store_accounts)
-               get_all_accounts (self);
-               
-       return priv->tny_store_accounts;
-}
-       
-
-static gboolean
-modest_tny_account_store_add_transport_account  (TnyAccountStoreIface *self,
-                                                TnyTransportAccountIface *account)
-{              
-       g_return_if_fail (self);
-       g_return_if_fail (account);
-       
-       return modest_tny_account_store_add_transport_account (self, account);
-}
-
-       
-static const GList*
-modest_tny_account_store_get_transport_accounts  (TnyAccountStoreIface *iface)
-{
-       ModestTnyAccountStore        *self;
-       ModestTnyAccountStorePrivate *priv;
-
-       g_return_if_fail (iface);
-       
-       self = MODEST_TNY_ACCOUNT_STORE(iface);
-       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-
-       if (!priv->tny_transport_accounts)
-               get_all_accounts (self);
-       
-       return priv->tny_transport_accounts;
-}
-
-
-static void
-modest_tny_account_store_iface_init (gpointer g_iface, gpointer iface_data)
-{
-        TnyAccountStoreIfaceClass *klass;
-
-       g_return_if_fail (g_iface);
-       
-       klass = (TnyAccountStoreIfaceClass *)g_iface;
-
-        klass->add_store_account_func      = modest_tny_account_store_add_store_account;
-        klass->get_store_accounts_func     = modest_tny_account_store_get_store_accounts;
-        klass->add_transport_account_func  = modest_tny_account_store_add_transport_account;
-        klass->get_transport_accounts_func = modest_tny_account_store_get_transport_accounts;
-}
-
diff --git a/experimental/modest/src/modest-tny-account-store.h b/experimental/modest/src/modest-tny-account-store.h
deleted file mode 100644 (file)
index e8f96a6..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-/* modest-tny-account-store.h */
-/* insert (c)/licensing information) */
-
-#ifndef __MODEST_TNY_ACCOUNT_STORE_H__
-#define __MODEST_TNY_ACCOUNT_STORE_H__
-
-#include <glib-object.h>
-/* other include files */
-
-G_BEGIN_DECLS
-
-/* convenience macros */
-#define MODEST_TYPE_TNY_ACCOUNT_STORE             (modest_tny_account_store_get_type())
-#define MODEST_TNY_ACCOUNT_STORE(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj),MODEST_TYPE_TNY_ACCOUNT_STORE,ModestTnyAccountStore))
-#define MODEST_TNY_ACCOUNT_STORE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass),MODEST_TYPE_TNY_ACCOUNT_STORE,GObject))
-#define MODEST_IS_TNY_ACCOUNT_STORE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj),MODEST_TYPE_TNY_ACCOUNT_STORE))
-#define MODEST_IS_TNY_ACCOUNT_STORE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass),MODEST_TYPE_TNY_ACCOUNT_STORE))
-#define MODEST_TNY_ACCOUNT_STORE_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj),MODEST_TYPE_TNY_ACCOUNT_STORE,ModestTnyAccountStoreClass))
-
-typedef struct _ModestTnyAccountStore      ModestTnyAccountStore;
-typedef struct _ModestTnyAccountStoreClass ModestTnyAccountStoreClass;
-
-struct _ModestTnyAccountStore {
-        GObject parent;
-       /* insert public members, if any */
-};
-
-struct _ModestTnyAccountStoreClass {
-       GObjectClass parent_class;
-       /* insert signal callback declarations, eg. */
-       /* void (* my_event) (ModestTnyAccountStore* obj); */
-};
-
-/* member functions */
-GType        modest_tny_account_store_get_type    (void) G_GNUC_CONST;
-
-/* typical parameter-less _new function */
-/* if this is a kind of GtkWidget, it should probably return at GtkWidget*, */
-/*    otherwise probably a GObject*. */
-GObject*    modest_tny_account_store_new         (ModestAccountMgr *modest_acc_mgr);
-
-/* fill in other public functions, eg.: */
-/*     void       modest_tny_account_store_do_something (ModestTnyAccountStore *self, const gchar* param); */
-/*     gboolean   modest_tny_account_store_has_foo      (ModestTnyAccountStore *self, gint value); */
-
-
-G_END_DECLS
-
-#endif /* __MODEST_TNY_ACCOUNT_STORE_H__ */
-
diff --git a/experimental/modest/src/modest-tny-folder-tree-view.c b/experimental/modest/src/modest-tny-folder-tree-view.c
deleted file mode 100644 (file)
index 76ab698..0000000
+++ /dev/null
@@ -1,302 +0,0 @@
-/* modest-tny-folder-tree-view.c */
-
-/* insert (c)/licensing information) */
-#include <glib/gi18n.h>
-
-#include <tny-account-tree-model.h>
-#include <tny-account-store-iface.h>
-#include <tny-account-iface.h>
-#include <tny-summary-window-iface.h>
-
-#include "modest-tny-folder-tree-view.h"
-/* include other impl specific header files */
-
-/* 'private'/'protected' functions */
-static void modest_tny_folder_tree_view_class_init  (ModestTnyFolderTreeViewClass *klass);
-static void modest_tny_folder_tree_view_init        (ModestTnyFolderTreeView *obj);
-static void modest_tny_folder_tree_view_finalize    (GObject *obj);
-
-static void modest_tny_folder_tree_view_iface_init   (gpointer iface, gpointer data);
-static void modest_tny_folder_tree_view_set_account_store (TnySummaryWindowIface *self,
-                                                          TnyAccountStoreIface *account_store);
-static gboolean update_model (ModestTnyFolderTreeView *self,TnyAccountStoreIface *iface);
-static gboolean update_model_empty (ModestTnyFolderTreeView *self);
-
-static void selection_changed (GtkTreeSelection *sel, gpointer data);
-
-/* list my signals */
-enum {
-       FOLDER_SELECTED_SIGNAL,
-       LAST_SIGNAL
-};
-
-typedef struct _ModestTnyFolderTreeViewPrivate ModestTnyFolderTreeViewPrivate;
-struct _ModestTnyFolderTreeViewPrivate {
-       TnyAccountStoreIface *tny_account_store;
-       gboolean view_is_empty;
-       
-};
-#define MODEST_TNY_FOLDER_TREE_VIEW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
-                                                         MODEST_TYPE_TNY_FOLDER_TREE_VIEW, \
-                                                         ModestTnyFolderTreeViewPrivate))
-/* globals */
-static GObjectClass *parent_class = NULL;
-
-static guint signals[LAST_SIGNAL] = {0}; 
-
-GType
-modest_tny_folder_tree_view_get_type (void)
-{
-       static GType my_type = 0;
-       if (!my_type) {
-               static const GTypeInfo my_info = {
-                       sizeof(ModestTnyFolderTreeViewClass),
-                       NULL,           /* base init */
-                       NULL,           /* base finalize */
-                       (GClassInitFunc) modest_tny_folder_tree_view_class_init,
-                       NULL,           /* class finalize */
-                       NULL,           /* class data */
-                       sizeof(ModestTnyFolderTreeView),
-                       1,              /* n_preallocs */
-                       (GInstanceInitFunc) modest_tny_folder_tree_view_init,
-               };
-               
-               static const GInterfaceInfo iface_info = {
-                       (GInterfaceInitFunc) modest_tny_folder_tree_view_iface_init,
-                       NULL, /* finalize */
-                       NULL /* data */
-               };
-               
-               my_type = g_type_register_static (GTK_TYPE_TREE_VIEW,
-                                                 "ModestTnyFolderTreeView",
-                                                 &my_info, 0);
-               g_type_add_interface_static (my_type, TNY_TYPE_SUMMARY_WINDOW_IFACE,
-                                            &iface_info);
-               
-       }
-       return my_type;
-}
-
-static void
-modest_tny_folder_tree_view_class_init (ModestTnyFolderTreeViewClass *klass)
-{
-       GObjectClass *gobject_class;
-       gobject_class = (GObjectClass*) klass;
-
-       parent_class            = g_type_class_peek_parent (klass);
-       gobject_class->finalize = modest_tny_folder_tree_view_finalize;
-
-       g_type_class_add_private (gobject_class,
-                                 sizeof(ModestTnyFolderTreeViewPrivate));
-       
-       signals[FOLDER_SELECTED_SIGNAL] = 
-               g_signal_new ("folder_selected",
-                             G_TYPE_FROM_CLASS (gobject_class),
-                             G_SIGNAL_RUN_FIRST,
-                             G_STRUCT_OFFSET (ModestTnyFolderTreeViewClass,folder_selected),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__POINTER,
-                             G_TYPE_NONE, 1, G_TYPE_POINTER); 
-}
-               
-static void
-modest_tny_folder_tree_view_init (ModestTnyFolderTreeView *obj)
-{
-       ModestTnyFolderTreeViewPrivate *priv;
-       priv =  MODEST_TNY_FOLDER_TREE_VIEW_GET_PRIVATE(obj);
-
-       priv->view_is_empty     = TRUE;
-       priv->tny_account_store = NULL;
-}
-
-
-static void
-modest_tny_folder_tree_view_iface_init (gpointer iface, gpointer data)
-{
-       TnySummaryWindowIfaceClass *klass;
-
-       g_return_if_fail (iface);
-       
-       klass = (TnySummaryWindowIfaceClass*) iface;
-               
-       klass->set_account_store_func =
-               modest_tny_folder_tree_view_set_account_store;
-}
-
-
-
-
-static void
-modest_tny_folder_tree_view_finalize (GObject *obj)
-{
-       ModestTnyFolderTreeViewPrivate *priv;
-
-       g_return_if_fail (obj);
-       
-       priv =  MODEST_TNY_FOLDER_TREE_VIEW_GET_PRIVATE(obj);
-       if (priv->tny_account_store) {
-               g_object_unref (G_OBJECT(priv->tny_account_store));
-               priv->tny_account_store = NULL;
-       }
-       
-       (*parent_class->finalize)(obj);
-}
-
-
-static void
-modest_tny_folder_tree_view_set_account_store (TnySummaryWindowIface *self,
-                                              TnyAccountStoreIface *account_store)
-{
-       ModestTnyFolderTreeViewPrivate *priv;
-
-       g_return_if_fail (self);
-       g_return_if_fail (account_store);
-       
-       priv = MODEST_TNY_FOLDER_TREE_VIEW_GET_PRIVATE(self);
-       if (priv->tny_account_store) {
-               g_object_unref (priv->tny_account_store);
-               priv->tny_account_store = NULL;
-       }
-
-       g_object_ref (G_OBJECT(priv->tny_account_store = account_store));
-}
-
-
-
-GtkWidget*
-modest_tny_folder_tree_view_new (TnyAccountStoreIface *iface)
-{
-       GObject *self;
-       ModestTnyFolderTreeViewPrivate *priv;
-       GtkTreeSelection *sel;
-
-       self = G_OBJECT(g_object_new(MODEST_TYPE_TNY_FOLDER_TREE_VIEW, NULL));
-       priv = MODEST_TNY_FOLDER_TREE_VIEW_GET_PRIVATE(self);
-
-       g_return_val_if_fail (iface, NULL);
-       
-       if (!update_model (MODEST_TNY_FOLDER_TREE_VIEW(self), iface))
-               g_warning ("failed or update model");
-
-       sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
-       g_signal_connect (sel, "changed",
-                         G_CALLBACK(selection_changed), self);
-               
-       return GTK_WIDGET(self);
-}
-
-
-
-
-static gboolean
-update_model_empty (ModestTnyFolderTreeView *self)
-{
-       GtkTreeIter  iter;
-       GtkTreeStore *store;
-       ModestTnyFolderTreeViewPrivate *priv;
-       
-       g_return_val_if_fail (self, FALSE);
-       
-       store = gtk_tree_store_new (1, G_TYPE_STRING);
-       gtk_tree_store_append (store, &iter, NULL);
-
-       gtk_tree_store_set (store, &iter, 0,
-                           _("(empty)"), -1);
-
-       gtk_tree_view_set_model (GTK_TREE_VIEW(self),
-                                GTK_TREE_MODEL(store));
-       g_object_unref (store);
-
-       priv = MODEST_TNY_FOLDER_TREE_VIEW_GET_PRIVATE(self);
-       priv->view_is_empty = TRUE;
-       
-       return TRUE;
-}
-
-
-static gboolean
-update_model (ModestTnyFolderTreeView *self,TnyAccountStoreIface *iface)
-{
-       const GList *accounts;
-       TnyAccountTreeModel *folder_model;
-       ModestTnyFolderTreeViewPrivate *priv;
-               
-       g_return_val_if_fail (iface, FALSE);
-
-       priv =  MODEST_TNY_FOLDER_TREE_VIEW_GET_PRIVATE(self);
-       priv->view_is_empty = TRUE;
-
-       accounts = tny_account_store_iface_get_store_accounts (iface);
-       if (!accounts) {
-               g_warning ("no accounts have been defined yet");
-               return update_model_empty (self);
-       }
-       
-       folder_model = tny_account_tree_model_new ();
-       if (!folder_model) {
-               g_warning ("failed to get account tree model");
-               return update_model_empty (self);
-       }
-       
-       while (accounts) {
-               TnyStoreAccountIface *account =
-                       TNY_STORE_ACCOUNT_IFACE(accounts->data);
-               if (!account) {
-                       g_warning ("invalid account");
-                       g_object_unref (folder_model);
-                       return update_model_empty (self);
-               }
-               tny_account_tree_model_add (TNY_ACCOUNT_TREE_MODEL (folder_model),
-                                           account);
-               accounts = accounts->next;
-       }
-       
-       gtk_tree_view_set_model (GTK_TREE_VIEW(self),
-                                GTK_TREE_MODEL(folder_model)); 
-       g_object_unref (G_OBJECT(folder_model));
-       
-       priv->view_is_empty = FALSE; /* were not empty anymore! */
-       return TRUE;
-}
-
-
-
-
-
-
-
-void
-selection_changed (GtkTreeSelection *sel, gpointer user_data)
-{
-       GtkTreeModel            *model;
-       TnyMsgFolderIface       *folder;
-       GtkTreeIter             iter;
-       ModestTnyFolderTreeView *tree_view;
-       ModestTnyFolderTreeViewPrivate *priv;
-
-       
-       g_return_if_fail (sel);
-       g_return_if_fail (user_data);
-
-       priv = MODEST_TNY_FOLDER_TREE_VIEW_GET_PRIVATE(user_data);
-
-       /* is_empty means that there is only the 'empty' item */
-       if (priv->view_is_empty)
-               return;
-       
-       if (!gtk_tree_selection_get_selected (sel, &model, &iter))
-               return; /* folder was _un_selected */
-
-       tree_view = MODEST_TNY_FOLDER_TREE_VIEW (user_data);
-
-       gtk_tree_model_get (model, &iter,
-                           TNY_ACCOUNT_TREE_MODEL_INSTANCE_COLUMN,
-                           &folder, -1);
-       
-       g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTED_SIGNAL], 0,
-                      folder); 
-}
-
-
-
-
diff --git a/experimental/modest/src/modest-tny-folder-tree-view.h b/experimental/modest/src/modest-tny-folder-tree-view.h
deleted file mode 100644 (file)
index 5b27bb0..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-/* modest-tny-folder-tree-view.h */
-/* insert (c)/licensing information) */
-
-#ifndef __MODEST_TNY_FOLDER_TREE_VIEW_H__
-#define __MODEST_TNY_FOLDER_TREE_VIEW_H__
-
-#include <tny-account-tree-model.h>
-#include <tny-account-store-iface.h>
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* convenience macros */
-#define MODEST_TYPE_TNY_FOLDER_TREE_VIEW             (modest_tny_folder_tree_view_get_type())
-#define MODEST_TNY_FOLDER_TREE_VIEW(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj),MODEST_TYPE_TNY_FOLDER_TREE_VIEW,ModestTnyFolderTreeView))
-#define MODEST_TNY_FOLDER_TREE_VIEW_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass),MODEST_TYPE_TNY_FOLDER_TREE_VIEW,GObject))
-#define MODEST_IS_TNY_FOLDER_TREE_VIEW(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj),MODEST_TYPE_TNY_FOLDER_TREE_VIEW))
-#define MODEST_IS_TNY_FOLDER_TREE_VIEW_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass),MODEST_TYPE_TNY_FOLDER_TREE_VIEW))
-#define MODEST_TNY_FOLDER_TREE_VIEW_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj),MODEST_TYPE_TNY_FOLDER_TREE_VIEW,ModestTnyFolderTreeViewClass))
-
-typedef struct _ModestTnyFolderTreeView      ModestTnyFolderTreeView;
-typedef struct _ModestTnyFolderTreeViewClass ModestTnyFolderTreeViewClass;
-
-struct _ModestTnyFolderTreeView {
-        GtkTreeView parent;
-       /* insert public members, if any */
-};
-
-struct _ModestTnyFolderTreeViewClass {
-       GtkTreeViewClass parent_class;
-
-       /* emitted when a folder is clicked */
-       void (*folder_selected) (ModestTnyFolderTreeView* self,
-                                TnyMsgFolderIface *folder,
-                                gpointer user_data);
-};
-
-
-/**
- * modest_tny_folder_tree_view_get_type:
- * 
- * get the GType for ModestTnyFolderTreeView
- *  
- * Returns: the GType
- */
-GType        modest_tny_folder_tree_view_get_type    (void) G_GNUC_CONST;
-
-
-/**
- * modest_tny_folder_tree_view_new:
- * @iface: a TnyAccountStoreIface object
- * 
- * create a new ModestTnyFolderTreeView instance, based on an account store
- *  
- * Returns: a new GtkWidget (a GtkTreeView-subclass)
- */
-
-GtkWidget*   modest_tny_folder_tree_view_new         (TnyAccountStoreIface *iface);
-
-
-/**
- * modest_tny_folder_tree_view_is_empty:
- * @self: a ModestTnyFolderTreeView instance
- * 
- * check to see of the view is empty. Note that when it is empty,
- * there will still be one item, telling "(empty)" or similar
- *  
- * Returns: TRUE if the tree view is empty, FALSE otherwise
- */
-gboolean     modest_tny_folder_tree_view_is_empty    (ModestTnyFolderTreeView *self);
-
-
-G_END_DECLS
-
-#endif /* __MODEST_TNY_FOLDER_TREE_VIEW_H__ */
-
diff --git a/experimental/modest/src/modest-tny-header-tree-view.c b/experimental/modest/src/modest-tny-header-tree-view.c
deleted file mode 100644 (file)
index cfa72eb..0000000
+++ /dev/null
@@ -1,209 +0,0 @@
-/* modest-tny-header-tree-view.c */
-
-/* insert (c)/licensing information) */
-
-#include "modest-tny-header-tree-view.h"
-
-/* 'private'/'protected' functions */
-static void modest_tny_header_tree_view_class_init  (ModestTnyHeaderTreeViewClass *klass);
-static void modest_tny_header_tree_view_init        (ModestTnyHeaderTreeView *obj);
-static void modest_tny_header_tree_view_finalize    (GObject *obj);
-
-static void selection_changed (GtkTreeSelection *sel, gpointer user_data);
-       
-/* list my signals */
-enum {
-       /* MY_SIGNAL_1, */
-       MESSAGE_SELECTED_SIGNAL,
-       LAST_SIGNAL
-};
-
-typedef struct _ModestTnyHeaderTreeViewPrivate ModestTnyHeaderTreeViewPrivate;
-struct _ModestTnyHeaderTreeViewPrivate {
-       TnyMsgFolderIface *tny_msg_folder;
-       GtkTreeModel *header_tree_model;
-};
-#define MODEST_TNY_HEADER_TREE_VIEW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
-                                                         MODEST_TYPE_TNY_HEADER_TREE_VIEW, \
-                                                         ModestTnyHeaderTreeViewPrivate))
-/* globals */
-static GObjectClass *parent_class = NULL;
-
-/* uncomment the following if you have defined any signals */
-static guint signals[LAST_SIGNAL] = {0};
-
-GType
-modest_tny_header_tree_view_get_type (void)
-{
-       static GType my_type = 0;
-       if (!my_type) {
-               static const GTypeInfo my_info = {
-                       sizeof(ModestTnyHeaderTreeViewClass),
-                       NULL,           /* base init */
-                       NULL,           /* base finalize */
-                       (GClassInitFunc) modest_tny_header_tree_view_class_init,
-                       NULL,           /* class finalize */
-                       NULL,           /* class data */
-                       sizeof(ModestTnyHeaderTreeView),
-                       1,              /* n_preallocs */
-                       (GInstanceInitFunc) modest_tny_header_tree_view_init,
-               };
-               my_type = g_type_register_static (GTK_TYPE_TREE_VIEW,
-                                                 "ModestTnyHeaderTreeView",
-                                                 &my_info, 0);
-       }
-       return my_type;
-}
-
-static void
-modest_tny_header_tree_view_class_init (ModestTnyHeaderTreeViewClass *klass)
-{
-       GObjectClass *gobject_class;
-       gobject_class = (GObjectClass*) klass;
-
-       parent_class            = g_type_class_peek_parent (klass);
-       gobject_class->finalize = modest_tny_header_tree_view_finalize;
-
-       g_type_class_add_private (gobject_class, sizeof(ModestTnyHeaderTreeViewPrivate));
-
-       signals[MESSAGE_SELECTED_SIGNAL] = 
-               g_signal_new ("message_selected",
-                             G_TYPE_FROM_CLASS (gobject_class),
-                             G_SIGNAL_RUN_FIRST,
-                             G_STRUCT_OFFSET (ModestTnyHeaderTreeViewClass,message_selected),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__POINTER,
-                             G_TYPE_NONE, 1, G_TYPE_POINTER);  
-}
-
-static void
-modest_tny_header_tree_view_init (ModestTnyHeaderTreeView *obj)
-{
-       ModestTnyHeaderTreeViewPrivate *priv;
-       priv = MODEST_TNY_HEADER_TREE_VIEW_GET_PRIVATE(obj); 
-
-       priv->tny_msg_folder = NULL;
-       priv->header_tree_model = NULL;
-}
-
-static void
-modest_tny_header_tree_view_finalize (GObject *obj)
-{
-       ModestTnyHeaderTreeView        *self;
-       ModestTnyHeaderTreeViewPrivate *priv;
-
-       self = MODEST_TNY_HEADER_TREE_VIEW(obj);
-       priv = MODEST_TNY_HEADER_TREE_VIEW_GET_PRIVATE(self);
-
-       if (priv->header_tree_model)    
-               g_object_unref (G_OBJECT(priv->header_tree_model));
-
-       priv->header_tree_model = NULL;
-       priv->tny_msg_folder    = NULL;
-}
-
-GtkWidget*
-modest_tny_header_tree_view_new (TnyMsgFolderIface *folder)
-{
-       GObject *obj;
-       GtkTreeSelection *sel;
-       ModestTnyHeaderTreeView *self;
-               
-       obj  = G_OBJECT(g_object_new(MODEST_TYPE_TNY_HEADER_TREE_VIEW, NULL));
-       self = MODEST_TNY_HEADER_TREE_VIEW(obj);
-
-       if (!modest_tny_header_tree_view_set_folder (self, NULL)) {
-               g_warning ("could not set the folder");
-               g_object_unref (obj);
-               return NULL;
-       }
-               
-       sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
-       g_signal_connect (sel, "changed",
-                         G_CALLBACK(selection_changed), self);
-
-       return GTK_WIDGET(self);
-}
-
-
-gboolean
-modest_tny_header_tree_view_set_folder (ModestTnyHeaderTreeView *self,
-                                       TnyMsgFolderIface *folder)
-{
-       GtkTreeModel *sortable;
-       ModestTnyHeaderTreeViewPrivate *priv;
-
-       g_return_val_if_fail (self, FALSE);
-
-       priv = MODEST_TNY_HEADER_TREE_VIEW_GET_PRIVATE(self);
-
-       /* clean up old stuff */
-       if (priv->header_tree_model)
-               g_object_unref (G_OBJECT(priv->header_tree_model));
-       priv->header_tree_model = NULL;
-       priv->header_tree_model = GTK_TREE_MODEL (tny_msg_header_list_model_new());
-
-       if (folder) {
-               tny_msg_header_list_model_set_folder (
-                       TNY_MSG_HEADER_LIST_MODEL(priv->header_tree_model),
-                       folder, TRUE);
-
-               sortable = gtk_tree_model_sort_new_with_model (priv->header_tree_model);
-               
-       } else {
-               static GtkTreeModel *empty_model = NULL;
-               if (!empty_model)
-                       empty_model = GTK_TREE_MODEL(gtk_list_store_new(1,G_TYPE_STRING));
-
-               sortable = empty_model;
-       }
-       
-       gtk_tree_view_set_model (GTK_TREE_VIEW (self), sortable);
-
-       if (sortable)
-               g_object_unref (G_OBJECT(sortable));
-       
-       return TRUE;
-}
-
-
-void
-selection_changed (GtkTreeSelection *sel, gpointer user_data)
-{
-       GtkTreeModel            *model;
-       TnyMsgHeaderIface       *header;
-       GtkTreeIter             iter;
-       ModestTnyHeaderTreeView *tree_view;
-
-       g_return_if_fail (sel);
-       g_return_if_fail (user_data);
-       
-       if (!gtk_tree_selection_get_selected (sel, &model, &iter))
-               return; /* msg was _un_selected */
-       
-       tree_view = MODEST_TNY_HEADER_TREE_VIEW (user_data);
-       
-       gtk_tree_model_get (model, &iter,
-                           TNY_MSG_HEADER_LIST_MODEL_INSTANCE_COLUMN,
-                           &header, -1);
-       
-       if (header) {
-               const TnyMsgIface *msg;
-               const TnyMsgFolderIface *folder;
-               
-               folder = tny_msg_header_iface_get_folder (TNY_MSG_HEADER_IFACE(header));
-               if (!folder) {
-                       g_warning ("cannot find folder");
-                       return;
-               }
-               
-               msg = tny_msg_folder_iface_get_message (TNY_MSG_FOLDER_IFACE(folder), header);
-               if (!msg) {
-                       g_warning ("cannot find msg");
-                       return;
-               }
-               
-               g_signal_emit (G_OBJECT(tree_view), signals[MESSAGE_SELECTED_SIGNAL], 0,
-                              msg); 
-       }
-}
diff --git a/experimental/modest/src/modest-tny-header-tree-view.h b/experimental/modest/src/modest-tny-header-tree-view.h
deleted file mode 100644 (file)
index 3d4c7b5..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-/* modest-tny-header-tree-view.h */
-/* insert (c)/licensing information) */
-
-#ifndef __MODEST_TNY_HEADER_TREE_VIEW_H__
-#define __MODEST_TNY_HEADER_TREE_VIEW_H__
-
-#include <gtk/gtk.h>
-#include <tny-msg-folder-iface.h>
-#include <tny-account-tree-model.h>
-#include <tny-msg-iface.h>
-#include <tny-msg-header-iface.h>
-#include <tny-msg-header-list-model.h>
-
-G_BEGIN_DECLS
-
-/* convenience macros */
-#define MODEST_TYPE_TNY_HEADER_TREE_VIEW             (modest_tny_header_tree_view_get_type())
-#define MODEST_TNY_HEADER_TREE_VIEW(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj),MODEST_TYPE_TNY_HEADER_TREE_VIEW,ModestTnyHeaderTreeView))
-#define MODEST_TNY_HEADER_TREE_VIEW_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass),MODEST_TYPE_TNY_HEADER_TREE_VIEW,GObject))
-#define MODEST_IS_TNY_HEADER_TREE_VIEW(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj),MODEST_TYPE_TNY_HEADER_TREE_VIEW))
-#define MODEST_IS_TNY_HEADER_TREE_VIEW_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass),MODEST_TYPE_TNY_HEADER_TREE_VIEW))
-#define MODEST_TNY_HEADER_TREE_VIEW_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj),MODEST_TYPE_TNY_HEADER_TREE_VIEW,ModestTnyHeaderTreeViewClass))
-
-typedef struct _ModestTnyHeaderTreeView      ModestTnyHeaderTreeView;
-typedef struct _ModestTnyHeaderTreeViewClass ModestTnyHeaderTreeViewClass;
-
-struct _ModestTnyHeaderTreeView {
-        GtkTreeView parent;
-       /* insert public members, if any */
-};
-
-struct _ModestTnyHeaderTreeViewClass {
-       GtkTreeViewClass parent_class;
-
-       void (*message_selected) (ModestTnyHeaderTreeView* self,
-                                 TnyMsgIface *msg,
-                                 gpointer user_data);
-};
-
-
-/**
- * modest_tny_header_tree_view_get_type:
- * 
- * get the GType for ModestTnyHeaderTreeView
- *  
- * Returns: the GType
- */
-GType        modest_tny_header_tree_view_get_type    (void) G_GNUC_CONST;
-
-
-/**
- * modest_tny_header_tree_view_new:
- * @folder: a TnyMsgFolderIface object
- * 
- * create a new ModestTnyHeaderTreeView instance, based on a folder iface
- *  
- * Returns: a new GtkWidget (a GtkTreeView-subclass)
- */
-GtkWidget*   modest_tny_header_tree_view_new        (TnyMsgFolderIface *folder);
-
-
-/**
- * modest_tny_header_tree_view_set_folder:
- * @self: a ModestTnyHeaderTreeView instance
- * @folder: a TnyMsgFolderIface object
- * 
- * set the folder for this ModestTnyHeaderTreeView
- *  
- * Returns: TRUE if it succeeded, FALSE otherwise
- */
-gboolean     modest_tny_header_tree_view_set_folder (ModestTnyHeaderTreeView *self,
-                                                     TnyMsgFolderIface *folder);
-
-G_END_DECLS
-
-#endif /* __MODEST_TNY_HEADER_TREE_VIEW_H__ */
-
diff --git a/experimental/modest/src/modest-tny-msg-view.c b/experimental/modest/src/modest-tny-msg-view.c
deleted file mode 100644 (file)
index 00dbe5b..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-/* modest-tny-msg-view.c */
-
-/* insert (c)/licensing information) */
-
-#include "modest-tny-msg-view.h"
-/* include other impl specific header files */
-
-/* 'private'/'protected' functions */
-static void                     modest_tny_msg_view_class_init   (ModestTnyMsgViewClass *klass);
-static void                     modest_tny_msg_view_init         (ModestTnyMsgView *obj);
-static void                     modest_tny_msg_view_finalize     (GObject *obj);
-
-/* list my signals */
-enum {
-       /* MY_SIGNAL_1, */
-       /* MY_SIGNAL_2, */
-       LAST_SIGNAL
-};
-
-typedef struct _ModestTnyMsgViewPrivate ModestTnyMsgViewPrivate;
-struct _ModestTnyMsgViewPrivate {
-       GtkWidget *text_view;
-};
-#define MODEST_TNY_MSG_VIEW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
-                                                 MODEST_TYPE_TNY_MSG_VIEW, \
-                                                 ModestTnyMsgViewPrivate))
-/* globals */
-static GtkContainerClass *parent_class = NULL;
-
-/* uncomment the following if you have defined any signals */
-/* static guint signals[LAST_SIGNAL] = {0}; */
-
-GType
-modest_tny_msg_view_get_type (void)
-{
-       static GType my_type = 0;
-       if (!my_type) {
-               static const GTypeInfo my_info = {
-                       sizeof(ModestTnyMsgViewClass),
-                       NULL,           /* base init */
-                       NULL,           /* base finalize */
-                       (GClassInitFunc) modest_tny_msg_view_class_init,
-                       NULL,           /* class finalize */
-                       NULL,           /* class data */
-                       sizeof(ModestTnyMsgView),
-                       1,              /* n_preallocs */
-                       (GInstanceInitFunc) modest_tny_msg_view_init,
-               };
-               my_type = g_type_register_static (GTK_TYPE_FRAME,
-                                                 "ModestTnyMsgView",
-                                                 &my_info, 0);
-       }
-       return my_type;
-}
-
-static void
-modest_tny_msg_view_class_init (ModestTnyMsgViewClass *klass)
-{
-       GObjectClass *gobject_class;
-       gobject_class = (GObjectClass*) klass;
-
-       parent_class            = g_type_class_peek_parent (klass);
-       gobject_class->finalize = modest_tny_msg_view_finalize;
-
-       g_type_class_add_private (gobject_class, sizeof(ModestTnyMsgViewPrivate));
-
-       /* signal definitions go here, e.g.: */
-/*     signals[MY_SIGNAL_1] = */
-/*             g_signal_new ("my_signal_1",....); */
-/*     signals[MY_SIGNAL_2] = */
-/*             g_signal_new ("my_signal_2",....); */
-/*     etc. */
-}
-
-static void
-modest_tny_msg_view_init (ModestTnyMsgView *obj)
-{
-       ModestTnyMsgViewPrivate *priv;
-
-       priv = MODEST_TNY_MSG_VIEW_GET_PRIVATE(obj);
-
-       priv->text_view = NULL;
-}
-
-static void
-modest_tny_msg_view_finalize (GObject *obj)
-{
-       /* no need to unref the text_view */    
-}
-
-GtkWidget*
-modest_tny_msg_view_new (TnyMsgIface *msg)
-{
-       GObject *obj;
-       ModestTnyMsgView* self;
-       ModestTnyMsgViewPrivate *priv;
-
-       obj  = G_OBJECT(g_object_new(MODEST_TYPE_TNY_MSG_VIEW, NULL));
-       self = MODEST_TNY_MSG_VIEW(obj);
-       priv = MODEST_TNY_MSG_VIEW_GET_PRIVATE(self);
-       
-       priv->text_view = gtk_text_view_new ();
-       gtk_text_view_set_editable       (GTK_TEXT_VIEW(priv->text_view), FALSE);
-       gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW(priv->text_view), FALSE);
-
-       gtk_container_add (GTK_CONTAINER(self), priv->text_view);
-       
-       if (msg)
-               modest_tny_msg_view_set_message (self, msg);
-
-       return GTK_WIDGET(self);
-}
-
-
-
-void
-modest_tny_msg_view_set_message (ModestTnyMsgView *self, TnyMsgIface *msg)
-{
-       ModestTnyMsgViewPrivate *priv;
-       GtkTextBuffer *buf;
-       GList *parts;
-       TnyStreamIface *stream;
-       
-       g_return_if_fail (self);
-
-       priv = MODEST_TNY_MSG_VIEW_GET_PRIVATE(self);
-       buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW(priv->text_view));
-
-       /* if msg is NULL, just delete the stuff */
-       if (!msg) {
-               gtk_text_buffer_set_text (buf, NULL, 0);
-               return;
-       }
-       
-       /* otherwise... find the body part */
-       stream = TNY_STREAM_IFACE(tny_text_buffer_stream_new(buf));
-       parts  = (GList*) tny_msg_iface_get_parts (msg);
-       while (parts) {
-               TnyMsgMimePartIface *part =
-                       TNY_MSG_MIME_PART_IFACE(parts->data);
-               
-               if (tny_msg_mime_part_iface_content_type_is (part, "text/plain")) {
-                       tny_stream_iface_reset (stream);
-                       tny_msg_mime_part_iface_write_to_stream (part, stream);
-                       tny_stream_iface_reset (stream);
-                       break;
-               }
-
-               parts = parts->next;
-       }
-}
diff --git a/experimental/modest/src/modest-tny-msg-view.h b/experimental/modest/src/modest-tny-msg-view.h
deleted file mode 100644 (file)
index 661728c..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-/* modest-tny-msg-view.h */
-/* insert (c)/licensing information) */
-
-#ifndef __MODEST_TNY_MSG_VIEW_H__
-#define __MODEST_TNY_MSG_VIEW_H__
-
-
-#include <gtk/gtk.h>
-#include <tny-stream-iface.h>
-#include <tny-msg-iface.h>
-#include <tny-msg-mime-part-iface.h>
-
-G_BEGIN_DECLS
-
-/* convenience macros */
-#define MODEST_TYPE_TNY_MSG_VIEW             (modest_tny_msg_view_get_type())
-#define MODEST_TNY_MSG_VIEW(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj),MODEST_TYPE_TNY_MSG_VIEW,ModestTnyMsgView))
-#define MODEST_TNY_MSG_VIEW_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass),MODEST_TYPE_TNY_MSG_VIEW,GObject))
-#define MODEST_IS_TNY_MSG_VIEW(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj),MODEST_TYPE_TNY_MSG_VIEW))
-#define MODEST_IS_TNY_MSG_VIEW_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass),MODEST_TYPE_TNY_MSG_VIEW))
-#define MODEST_TNY_MSG_VIEW_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj),MODEST_TYPE_TNY_MSG_VIEW,ModestTnyMsgViewClass))
-
-typedef struct _ModestTnyMsgView      ModestTnyMsgView;
-typedef struct _ModestTnyMsgViewClass ModestTnyMsgViewClass;
-
-struct _ModestTnyMsgView {
-       GtkFrame parent;
-       /* insert public members, if any */
-};
-
-struct _ModestTnyMsgViewClass {
-       GtkFrameClass parent_class;
-       /* insert signal callback declarations, eg. */
-       /* void (* my_event) (ModestTnyMsgView* obj); */
-};
-
-/* member functions */
-GType        modest_tny_msg_view_get_type    (void) G_GNUC_CONST;
-
-
-
-GtkWidget*   modest_tny_msg_view_new          (TnyMsgIface *tny_msg);
-void         modest_tny_msg_view_set_message  (ModestTnyMsgView *self,
-                                               TnyMsgIface *tny_msg);
-
-
-G_END_DECLS
-
-#endif /* __MODEST_TNY_MSG_VIEW_H__ */
-
diff --git a/experimental/modest/src/modest-ui.h b/experimental/modest/src/modest-ui.h
deleted file mode 100644 (file)
index 55fa6a1..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-/* modest-ui.h */
-/* insert (c)/licensing information) */
-
-#ifndef __MODEST_UI_H__
-#define __MODEST_UI_H__
-
-#include <glib-object.h>
-#include "modest-conf.h"
-
-G_BEGIN_DECLS
-
-/* convenience macros */
-#define MODEST_TYPE_UI             (modest_ui_get_type())
-#define MODEST_UI(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj),MODEST_TYPE_UI,ModestUI))
-#define MODEST_UI_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass),MODEST_TYPE_UI,GObject))
-#define MODEST_IS_UI(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj),MODEST_TYPE_UI))
-#define MODEST_IS_UI_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass),MODEST_TYPE_UI))
-#define MODEST_UI_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj),MODEST_TYPE_UI,ModestUIClass))
-
-typedef struct _ModestUI      ModestUI;
-typedef struct _ModestUIClass ModestUIClass;
-
-struct _ModestUI {
-        GObject parent;
-       /* insert public members, if any */
-};
-
-struct _ModestUIClass {
-       GObjectClass parent_class;
-       /* insert signal callback declarations, eg. */
-       /* void (* my_event) (ModestUI* obj); */
-};
-
-
-/**
- * modest_ui_get_type:
- * 
- * get the GType for ModestUI
- *  
- * Returns: the GType
- */
-GType        modest_ui_get_type        (void) G_GNUC_CONST;
-
-
-
-/**
- * modest_ui_new:
- * @modest_conf: a ModestConf instance 
- *  
- * Returns: a new ModestUI, or NULL in case of error
- */
-GObject*     modest_ui_new             (ModestConf *modest_conf);
-
-
-/**
- * modest_ui_show_main_window:
- * @ui: a ModestUI instance 
- *  
- * Returns: TRUE if succeeded, FALSE otherwise
- * 
- */
-gboolean     modest_ui_show_main_window (ModestUI *ui);
-
-
-/**
- * modest_ui_show_new_edit_window:
- * @ui: a ModestUI instance 
- * @to: people to send this to, ';' separated
- * @cc: people send carbon-copies (cc), ';' separated
- * @bcc people send blind-carbon-copies (bcc),';' separated
- * @subject: the subject of the message
- * @body: the body text of the message
- * @att: a list with the filepaths for attachments
- *  
- * Returns: TRUE if succeeded, FALSE otherwise
- */
-gboolean     modest_ui_show_edit_window (ModestUI *ui,
-                                        const gchar* to,
-                                        const gchar* cc,
-                                        const gchar* bcc,
-                                        const gchar* subject,
-                                        const gchar* body,
-                                        const GSList* att);
-
-G_END_DECLS
-
-#endif /* __MODEST_UI_H__ */
-
diff --git a/experimental/modest/src/modest-window-mgr.c b/experimental/modest/src/modest-window-mgr.c
deleted file mode 100644 (file)
index f06d081..0000000
+++ /dev/null
@@ -1,200 +0,0 @@
-/* modest-window-mgr.c */
-
-/* insert (c)/licensing information) */
-
-#include "modest-window-mgr.h"
-/* include other impl specific header files */
-
-/* 'private'/'protected' functions */
-static void                   modest_window_mgr_class_init    (ModestWindowMgrClass *klass);
-static void                   modest_window_mgr_init          (ModestWindowMgr *obj);
-static void                   modest_window_mgr_finalize      (GObject *obj);
-
-/* list my signals */
-enum {
-       /* MY_SIGNAL_1, */
-       /* MY_SIGNAL_2, */
-       LAST_WINDOW_CLOSED_SIGNAL,
-       LAST_SIGNAL
-};
-
-typedef struct _ModestWindowMgrPrivate ModestWindowMgrPrivate;
-struct _ModestWindowMgrPrivate {
-       GSList *open_windows;
-       
-};
-#define MODEST_WINDOW_MGR_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
-                                               MODEST_TYPE_WINDOW_MGR, \
-                                               ModestWindowMgrPrivate))
-/* globals */
-static GObjectClass *parent_class = NULL;
-
-static guint signals[LAST_SIGNAL] = {0};
-
-GType
-modest_window_mgr_get_type (void)
-{
-       static GType my_type = 0;
-       if (!my_type) {
-               static const GTypeInfo my_info = {
-                       sizeof(ModestWindowMgrClass),
-                       NULL,           /* base init */
-                       NULL,           /* base finalize */
-                       (GClassInitFunc) modest_window_mgr_class_init,
-                       NULL,           /* class finalize */
-                       NULL,           /* class data */
-                       sizeof(ModestWindowMgr),
-                       1,              /* n_preallocs */
-                       (GInstanceInitFunc) modest_window_mgr_init,
-               };
-               my_type = g_type_register_static (G_TYPE_OBJECT,
-                                                 "ModestWindowMgr",
-                                                 &my_info, 0);
-       }
-       return my_type;
-}
-
-static void
-modest_window_mgr_class_init (ModestWindowMgrClass *klass)
-{
-       GObjectClass *gobject_class;
-       gobject_class = (GObjectClass*) klass;
-
-       parent_class            = g_type_class_peek_parent (klass);
-       gobject_class->finalize = modest_window_mgr_finalize;
-
-       g_type_class_add_private (gobject_class, sizeof(ModestWindowMgrPrivate));
-
-       signals[LAST_WINDOW_CLOSED_SIGNAL] =
-               g_signal_new ("last_window_closed",
-                             G_TYPE_FROM_CLASS(gobject_class),
-                             G_SIGNAL_RUN_FIRST,
-                             G_STRUCT_OFFSET(ModestWindowMgrClass, last_window_closed),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__VOID,
-                             G_TYPE_NONE, 0);
-}
-
-static void
-modest_window_mgr_init (ModestWindowMgr *obj)
-{
-       ModestWindowMgrPrivate *priv = MODEST_WINDOW_MGR_GET_PRIVATE(obj);
-       priv->open_windows = NULL;
-}
-
-static void
-modest_window_mgr_finalize (GObject *obj)
-{
-       ModestWindowMgrPrivate *priv = MODEST_WINDOW_MGR_GET_PRIVATE(obj);
-       g_slist_free (priv->open_windows);
-       priv->open_windows = NULL;      
-}
-
-GObject*
-modest_window_mgr_new (void)
-{
-       return G_OBJECT(g_object_new(MODEST_TYPE_WINDOW_MGR, NULL));
-}
-
-/* insert many other interesting function implementations */
-/* such as modest_window_mgr_do_something, or modest_window_mgr_has_foo */
-
-gboolean
-modest_window_mgr_register (ModestWindowMgr *self, GObject *win,
-                           ModestWindowType type,
-                           guint window_id)
-{
-       ModestOpenWindow *openwin = NULL;
-       ModestWindowMgrPrivate *priv;
-
-       g_return_val_if_fail (self, FALSE);
-       g_return_val_if_fail (type==MODEST_MAIN_WINDOW||type==MODEST_EDIT_WINDOW,
-                             FALSE);
-
-       priv = MODEST_WINDOW_MGR_GET_PRIVATE(self);
-
-       openwin = g_new (ModestOpenWindow, 1);
-       openwin->win  = win;
-       openwin->type = type;
-       openwin->id   = window_id;
-       
-       priv->open_windows = g_slist_prepend (priv->open_windows, openwin);
-
-       return TRUE;
-}
-
-
-
-gboolean
-modest_window_mgr_unregister (ModestWindowMgr *self, GObject *win)
-{
-       ModestWindowMgrPrivate *priv;
-       GSList *cursor;
-       gboolean found = FALSE;
-       
-       g_return_val_if_fail (self, FALSE);
-       g_return_val_if_fail (win, FALSE);
-
-       priv = MODEST_WINDOW_MGR_GET_PRIVATE(self);
-
-       cursor = priv->open_windows;
-       while (cursor) {
-               if (((ModestOpenWindow*)cursor->data)->win == win) {
-                       priv->open_windows = g_slist_delete_link (priv->open_windows,
-                                                                 cursor);
-                       found = TRUE;
-                       break;
-               }
-               cursor = cursor->next;
-       }
-       if (found) {
-               guint win_num = g_slist_length (priv->open_windows);
-               if (win_num == 0) 
-                       g_signal_emit (self, signals[LAST_WINDOW_CLOSED_SIGNAL],
-                                      0);
-       }
-
-       return found;
-}
-
-
-GObject *
-modest_window_mgr_find_by_type (ModestWindowMgr *self, ModestWindowType type)
-{
-       ModestWindowMgrPrivate *priv;
-       GSList *cursor;
-
-       g_return_val_if_fail (self, NULL);
-       
-       priv = MODEST_WINDOW_MGR_GET_PRIVATE(self);
-       cursor = priv->open_windows;
-       while (cursor) {
-               ModestOpenWindow *openwin = (ModestOpenWindow*)cursor->data;
-               if (openwin->type == type)
-                       return openwin->win;
-               cursor = cursor->next;
-       }
-       
-       return NULL;
-}
-
-
-GObject *
-modest_window_mgr_find_by_id (ModestWindowMgr *self, gint window_id)
-{
-       ModestWindowMgrPrivate *priv;
-       GSList *cursor;
-
-       g_return_val_if_fail (self, NULL);
-       
-       priv = MODEST_WINDOW_MGR_GET_PRIVATE(self);
-       cursor = priv->open_windows;
-       while (cursor) {
-               ModestOpenWindow *openwin = (ModestOpenWindow*)cursor->data;
-               if (openwin->id == window_id)
-                       return openwin->win;
-               cursor = cursor->next;
-       }
-       return NULL;
-}
-
diff --git a/experimental/modest/src/modest-window-mgr.h b/experimental/modest/src/modest-window-mgr.h
deleted file mode 100644 (file)
index 2223651..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/* modest-window-mgr.h */
-/* insert (c)/licensing information) */
-
-#ifndef __MODEST_WINDOW_MGR_H__
-#define __MODEST_WINDOW_MGR_H__
-
-#include <glib-object.h>
-/* other include files */
-
-G_BEGIN_DECLS
-
-/* convenience macros */
-#define MODEST_TYPE_WINDOW_MGR             (modest_window_mgr_get_type())
-#define MODEST_WINDOW_MGR(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj),MODEST_TYPE_WINDOW_MGR,ModestWindowMgr))
-#define MODEST_WINDOW_MGR_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass),MODEST_TYPE_WINDOW_MGR,GObject))
-#define MODEST_IS_WINDOW_MGR(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj),MODEST_TYPE_WINDOW_MGR))
-#define MODEST_IS_WINDOW_MGR_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass),MODEST_TYPE_WINDOW_MGR))
-#define MODEST_WINDOW_MGR_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj),MODEST_TYPE_WINDOW_MGR,ModestWindowMgrClass))
-
-enum {
-       MODEST_MAIN_WINDOW,        /* the main window */
-       MODEST_EDIT_WINDOW,        /* a window to edit a mail */
-       MODEST_ACCOUNT_WINDOW,     /* a window to edit account information */
-       MODEST_VIEW_WINDOW         /* a window to view mails */
-};
-typedef guint ModestWindowType;
-
-
-typedef struct _ModestOpenWindow ModestOpenWindow;
-struct _ModestOpenWindow {
-       GObject          *win;
-       ModestWindowType type;
-       guint            id;
-};
-
-
-typedef struct _ModestWindowMgr      ModestWindowMgr;
-typedef struct _ModestWindowMgrClass ModestWindowMgrClass;
-
-struct _ModestWindowMgr {
-       GObject parent;
-};
-
-struct _ModestWindowMgrClass {
-       GObjectClass parent_class;
-       
-       void (* last_window_closed) (ModestWindowMgr* obj);
-};
-
-/* member functions */
-GType        modest_window_mgr_get_type    (void) G_GNUC_CONST;
-
-/* typical parameter-less _new function */
-/* if this is a kind of GtkWidget, it should probably return at GtkWidget*, */
-/*    otherwise probably a GObject*. */
-GObject*    modest_window_mgr_new         (void);
-
-gboolean    modest_window_mgr_register   (ModestWindowMgr *self, GObject *win,
-                                         ModestWindowType type, guint window_id);
-gboolean    modest_window_mgr_unregister (ModestWindowMgr *self, GObject *win);
-GObject*    modest_window_mgr_find_by_type (ModestWindowMgr *self, ModestWindowType type);
-GObject*    modest_window_mgr_find_by_id (ModestWindowMgr *self, gint window_id);
-
-G_END_DECLS
-
-#endif /* __MODEST_WINDOW_MGR_H__ */
-
diff --git a/experimental/util/tinycfg.sh b/experimental/util/tinycfg.sh
deleted file mode 100755 (executable)
index 9d8f7ae..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-gconftool-2 -s /apps/tinymail/accounts/count -t int 2
-gconftool-2 -s /apps/tinymail/accounts/1/type -t string transport
-gconftool-2 -s /apps/tinymail/accounts/1/proto -t string smtp
-gconftool-2 -s /apps/tinymail/accounts/1/user -t string $1
-gconftool-2 -s /apps/tinymail/accounts/1/hostname -t string mail.kernelconcepts.de
-
-gconftool-2 -s /apps/tinymail/accounts/0/type -t string store
-gconftool-2 -s /apps/tinymail/accounts/0/proto -t string imap
-gconftool-2 -s /apps/tinymail/accounts/0/user -t string $1
-gconftool-2 -s /apps/tinymail/accounts/0/hostname -t string tasha.kc.de