[pan2] forgot pan.ui.ssl.h



commit 604012610443b760e3f0819e65f081d03eb53801
Author: Heinrich MÃller <henmull src gnome org>
Date:   Wed Jan 4 23:06:07 2012 +0100

    forgot pan.ui.ssl.h

 README                           |   11 +-
 configure.in                     |    5 +-
 pan/gui/pan.ui.ssl.h             |  241 ++++++++++++++++++++++++++++++++++++++
 pan/tasks/socket-impl-openssl.cc |    1 +
 4 files changed, 251 insertions(+), 7 deletions(-)
---
diff --git a/README b/README
index 2b89bb2..00931f4 100644
--- a/README
+++ b/README
@@ -8,7 +8,7 @@ REQUIREMENTS
 
     Pan requires these libraries:
     * GTK+ 2.16.0 or higher (optionally GTK+ 3.0.0 or higher) <http://www.gtk.org/>
-    * GMime 2.6.0 or higher <http://spruce.sourceforge.net/gmime/>
+    * GMime 2.5.5 or higher <http://spruce.sourceforge.net/gmime/>
 
     Spellchecking requires the following library:
     * GtkSpell 2.0.7 or higher <http://gtkspell.sourceforge.net>
@@ -17,18 +17,20 @@ REQUIREMENTS
     * libnotify 0.4.1 or higher <http://www.galago-project.org/news/index.php>
     * GNOME Keyring 3.2.2 or higher <https://live.gnome.org/GnomeKeyring>
     * D-Bus <http://www.freedesktop.org/wiki/Software/dbus>
+    * GnuTLS 2.12.10 or higher for TLS 1.0 Support (encrypted connections)
+        <http://www.gnu.org/software/gnutls/>
 
     Most Linux distributions already have these; they can also be downloaded
     from their home pages.
 
     On Debian-based systems (for example Ubuntu), you can install the
     requirements with the following command:
-         
+
     sudo apt-get install <REQUIREMENT>
 
     On Fedora-based systems, run the following command to install the
     requirements:
-    
+
     sudo yum install -y <REQUIREMENT>
 
 
@@ -50,7 +52,6 @@ THE SALES PITCH
         * Works well as an offline reader.
         * Articles can be queued until you want to go online, and can be
           re-edited at any point before they're posted.
-        * Pan saves your posted messages in a folder for future reference.
         * A flexible rules system allows you to delete, hide, download,
           or notify you of, etc. articles that match a subject, or are
           posted by a particular user, and so on.
@@ -74,7 +75,7 @@ THE SALES PITCH
           automatically yEnc-encrypted, threaded and referenced by Pan.
         * Articles can be encrypted and/or signed with a public/private PGP key,
           so your privacy and security are ensured.
-        * Connections can be encrypted with secure SSL 3.0 connections.
+        * Connections can be encrypted with secure TLS 1.0 connections.
 
     The rest of the sales pitch is at <http://pan.rebelbase.com/features/>.
 
diff --git a/configure.in b/configure.in
index 55f9f0e..94ae452 100644
--- a/configure.in
+++ b/configure.in
@@ -52,7 +52,6 @@ GTK3_REQUIRED=3.0.0
 GTKSPELL_REQUIRED=2.0.7
 GNUTLS_REQUIRED=2.12.10
 LIBNOTIFY_REQUIRED=0.4.1
-LIBGSASL_REQUIRED=1.6.1
 LIBGKR_REQUIRED=3.2.2
 AC_SUBST(GLIB_REQUIRED)
 AC_SUBST(GMIME_REQUIRED)
@@ -60,9 +59,11 @@ AC_SUBST(GTK_REQUIRED)
 AC_SUBST(GTKSPELL_REQUIRED)
 AC_SUBST(GNUTLS_REQUIRED)
 AC_SUBST(LIBNOTIFY_REQUIRED)
-AC_SUBST(LIBGSASL_REQUIRED)
 AC_SUBST(LIBGKR_REQUIRED)
 
+dnl LIBGSASL_REQUIRED=1.6.1
+dnl AC_SUBST(LIBGSASL_REQUIRED)
+
 AC_PROG_CXX
 AC_HEADER_STDC
 AC_HEADER_TIME
diff --git a/pan/gui/pan.ui.ssl.h b/pan/gui/pan.ui.ssl.h
new file mode 100644
index 0000000..2867de5
--- /dev/null
+++ b/pan/gui/pan.ui.ssl.h
@@ -0,0 +1,241 @@
+const char * fallback_ui_file =
+"<ui>\n"
+"  <menubar name='main-window-menu'>\n"
+"    <menu action='file-menu'>\n"
+"      <menuitem action='import-tasks' />\n"
+"      <menuitem action='cancel-last-task' />\n"
+"      <menuitem action='work-online' />\n"
+"      <separator />\n"
+"      <menuitem action='show-task-window' />\n"
+"      <menuitem action='show-log-dialog' />\n"
+"      <separator />\n"
+"      <menuitem action='quit' />\n"
+"    </menu>\n"
+"    <menu action='edit-menu'>\n"
+"      <menuitem action='select-all-articles' />\n"
+"      <menuitem action='add-subthreads-to-selection' />\n"
+"      <menuitem action='add-threads-to-selection' />\n"
+"      <menuitem action='add-similar-articles-to-selection' />\n"
+"      <menuitem action='unselect-all-articles' />\n"
+"      <menuitem action='select-article-body' />\n"
+"      <separator />\n"
+"      <menuitem action='show-servers-dialog' />\n"
+"      <menuitem action='show-sec-dialog' />\n"
+"      <menuitem action='show-profiles-dialog' />\n"
+"      <menuitem action='show-preferences-dialog' />\n"
+"      <menuitem action='show-group-preferences-dialog' />\n"
+"    </menu>\n"
+"    <menu action='view-menu'>\n"
+"      <menuitem action='show-toolbar' />\n"
+"      <menu action='view-layout-menu'>\n"
+"        <menuitem action='tabbed-layout' />\n"
+"        <menuitem action='jump-to-group-tab' />\n"
+"        <menuitem action='jump-to-header-tab' />\n"
+"        <menuitem action='jump-to-body-tab' />\n"
+"        <separator />\n"
+"        <menuitem action='show-group-pane' />\n"
+"        <menuitem action='show-header-pane' />\n"
+"        <menuitem action='show-body-pane' />\n"
+"      </menu>\n"
+"      <menu action='view-group-pane-menu'>\n"
+"        <menuitem action='shorten-group-names' />\n"
+"      </menu>\n"
+"      <menu action='view-header-pane-menu'>\n"
+"        <menuitem action='thread-headers' />\n"
+"        <separator />\n"
+"        <menuitem action='enable-rules' />\n"
+"        <separator />\n"
+"        <menuitem action='show-matching-articles' />\n"
+"        <menuitem action='show-matching-threads' />\n"
+"        <menuitem action='show-matching-subthreads' />\n"
+"        <separator />\n"
+"        <menuitem action='match-only-unread-articles' />\n"
+"        <menuitem action='match-only-cached-articles' />\n"
+"        <menuitem action='match-only-binary-articles' />\n"
+"        <menuitem action='match-only-my-articles' />\n"
+"        <separator />\n"
+"        <menuitem action='match-watched-articles' />\n"
+"        <menuitem action='match-high-scoring-articles' />\n"
+"        <menuitem action='match-medium-scoring-articles' />\n"
+"        <menuitem action='match-normal-scoring-articles' />\n"
+"        <menuitem action='match-low-scoring-articles' />\n"
+"        <menuitem action='match-ignored-articles' />\n"
+"      </menu>\n"
+"      <menu action='view-body-pane-menu'>\n"
+"        <menuitem action='wrap-article-body' />\n"
+"        <menuitem action='mute-quoted-text' />\n"
+"        <menuitem action='show-all-headers' />\n"
+"        <menuitem action='monospace-font-enabled' />\n"
+"        <menuitem action='show-smilies-as-graphics' />\n"
+"        <menuitem action='show-text-markup'/>\n"
+"        <menuitem action='highlight-urls'/>\n"
+"        <menuitem action='rot13-selected-text' />\n"
+"        <separator />\n"
+"        <menuitem action='size-pictures-to-fit'/>\n"
+"        <menuitem action='focus-on-image'/>\n"
+"      </menu>\n"
+"    </menu>\n"
+"    <menu action='go-menu'>\n"
+"      <menuitem action='read-more' />\n"
+"      <menuitem action='read-less' />\n"
+"      <separator />\n"
+"      <menuitem action='read-next-unread-group' />\n"
+"      <menuitem action='read-next-group' />\n"
+"      <separator />\n"
+"      <menuitem action='read-next-unread-article' />\n"
+"      <menuitem action='read-next-article' />\n"
+"      <menuitem action='read-next-watched-article' />\n"
+"      <menuitem action='read-previous-article' />\n"
+"      <menuitem action='read-parent-article' />\n"
+"      <separator />\n"
+"      <menuitem action='read-next-unread-thread' />\n"
+"      <menuitem action='read-next-thread' />\n"
+"      <menuitem action='read-previous-thread' />\n"
+"    </menu>\n"
+"      <menu action='group-actions-menu'>\n"
+"        <menuitem action='read-selected-group' />\n"
+"        <menuitem action='mark-groups-read' />\n"
+"        <separator />\n"
+"        <menuitem action='download-headers' />\n"
+"        <menuitem action='get-new-headers-in-selected-groups' />\n"
+"        <menuitem action='get-new-headers-in-subscribed-groups'/>\n"
+"        <separator />\n"
+"        <menuitem action='show-group-preferences-dialog' />\n"
+"        <separator />\n"
+"        <menuitem action='subscribe' />\n"
+"        <menuitem action='unsubscribe' />\n"
+"        <separator />\n"
+"        <menuitem action='refresh-group-list' />\n"
+"        <separator />\n"
+"        <menuitem action='delete-groups-articles' />\n"
+"      </menu>\n"
+"      <menu action='article-actions-menu'>\n"
+"        <menuitem action='save-articles' />\n"
+"        <menuitem action='save-articles-from-nzb' />\n"
+"        <menuitem action='save-articles-to-nzb' />\n"
+"        <separator />\n"
+"        <menuitem action='read-selected-article' />\n"
+"        <menuitem action='download-selected-article' />\n"
+"        <menuitem action='show-selected-article-info' />\n"
+"        <separator />\n"
+"        <menuitem action='invert-selection' />\n"
+"        <separator />\n"
+"        <menuitem action='mark-article-read' />\n"
+"        <menuitem action='mark-article-unread' />\n"
+"        <separator />\n"
+"        <menuitem action='mark-thread-read' />\n"
+"        <menuitem action='mark-thread-unread' />\n"
+"        <separator />\n"
+"        <menuitem action='add-article-score' />\n"
+"        <menuitem action='watch-thread' />\n"
+"        <menuitem action='ignore-thread' />\n"
+"        <separator />\n"
+"        <menuitem action='flag-thread' />\n"
+"        <menuitem action='unflag-thread' />\n"
+"        <menuitem action='next-flagged' />\n"
+"        <menuitem action='last-flagged' />\n"
+"        <menuitem action='select-all-flagged' />\n"
+"        <separator />\n"
+"        <menuitem action='plonk' />\n"
+"        <menuitem action='view-article-score' />\n"
+"        <separator />\n"
+"        <menuitem action='delete-article' />\n"
+"      </menu>\n"
+"      <menu action='posting-actions-menu'>\n"
+"        <menuitem action='post' />\n"
+"        <menuitem action='followup-to' />\n"
+"        <menuitem action='reply-to' />\n"
+"        <separator />\n"
+"        <menuitem action='supersede-article' />\n"
+"        <menuitem action='cancel-article' />\n"
+"      </menu>\n"
+"    <menu action='help-menu'>\n"
+"      <menuitem action='pan-web-page' />\n"
+"      <menuitem action='tip-jar' />\n"
+"      <menuitem action='bug-report' />\n"
+"      <separator />\n"
+"      <menuitem action='about-pan' />\n"
+"    </menu>\n"
+"  </menubar>\n"
+"\n"
+"  <toolbar name='main-window-toolbar'>\n"
+"    <toolitem action='download-headers' />\n"
+"    <toolitem action='get-new-headers-in-subscribed-groups'/>\n"
+"    <toolitem action='get-new-headers-in-selected-groups'/>\n"
+"    <separator />\n"
+"    <placeholder name='group-pane-filter'/>\n"
+"    <separator />\n"
+"    <toolitem action='post'/>\n"
+"    <toolitem action='followup-to'/>\n"
+"    <separator />\n"
+"    <toolitem action='read-more' />\n"
+"    <toolitem action='read-next-unread-article' />\n"
+"    <toolitem action='read-next-unread-thread' />\n"
+"    <separator />\n"
+"    <toolitem action='save-articles' />\n"
+"    <separator />\n"
+"    <placeholder name='header-pane-filter' />\n"
+"    <separator />\n"
+"    <toolitem action='match-only-unread-articles' />\n"
+"    <toolitem action='match-only-cached-articles' />\n"
+"    <toolitem action='match-only-binary-articles' />\n"
+"    <toolitem action='match-only-my-articles' />\n"
+"    <toolitem action='match-only-watched-articles' />\n"
+"    <separator />\n"
+"    <toolitem action='wrap-article-body' />\n"
+"  </toolbar>\n"
+"\n"
+"  <popup name='header-pane-popup'>\n"
+"    <menuitem action='save-articles' />\n"
+"    <menuitem action='save-articles-from-nzb' />\n"
+"    <menuitem action='save-articles-to-nzb' />\n"
+"    <separator />\n"
+"    <menuitem action='read-selected-article' />\n"
+"    <menuitem action='download-selected-article' />\n"
+"    <menuitem action='show-selected-article-info' />\n"
+"    <separator />\n"
+"    <menuitem action='invert-selection' />\n"
+"    <separator />\n"
+"    <menuitem action='mark-article-read' />\n"
+"    <menuitem action='mark-article-unread' />\n"
+"    <separator />\n"
+"    <menuitem action='mark-thread-read' />\n"
+"    <menuitem action='mark-thread-unread' />\n"
+"    <separator />\n"
+"    <menuitem action='add-article-score' />\n"
+"    <menuitem action='watch-thread' />\n"
+"    <menuitem action='ignore-thread' />\n"
+"    <separator />\n"
+"    <menuitem action='flag-thread' />\n"
+"    <menuitem action='unflag-thread' />\n"
+"    <menuitem action='next-flagged' />\n"
+"    <menuitem action='last-flagged' />\n"
+"    <menuitem action='select-all-flagged' />\n"
+"    <separator />\n"
+"    <menuitem action='plonk' />\n"
+"    <menuitem action='view-article-score' />\n"
+"    <separator />\n"
+"    <menuitem action='delete-article' />\n"
+"  </popup>\n"
+"\n"
+"  <popup name='group-pane-popup'>\n"
+"    <menuitem action='read-selected-group' />\n"
+"    <menuitem action='mark-groups-read' />\n"
+"    <separator />\n"
+"    <menuitem action='download-headers' />\n"
+"    <menuitem action='get-new-headers-in-selected-groups' />\n"
+"    <menuitem action='get-new-headers-in-subscribed-groups'/>\n"
+"    <separator />\n"
+"    <menuitem action='post' />\n"
+"    <separator />\n"
+"    <menuitem action='show-group-preferences-dialog' />\n"
+"    <separator />\n"
+"    <menuitem action='subscribe' />\n"
+"    <menuitem action='unsubscribe' />\n"
+"    <separator />\n"
+"    <menuitem action='refresh-group-list' />\n"
+"    <separator />\n"
+"    <menuitem action='delete-groups-articles' />\n"
+"  </popup>\n"
+"\n"
+"</ui>\n";
diff --git a/pan/tasks/socket-impl-openssl.cc b/pan/tasks/socket-impl-openssl.cc
index 133b3ec..8e5e2a1 100644
--- a/pan/tasks/socket-impl-openssl.cc
+++ b/pan/tasks/socket-impl-openssl.cc
@@ -800,6 +800,7 @@ GIOChannelSocketGnuTLS :: gnutls_get_iochannel(GIOChannel* channel, const char*
 
   gnutls_priority_set_direct (
   session,
+  // prefer tls 1.0 for now....
   // "NONE:+VERS-SSL3.0:+CIPHER-ALL:+COMP-ALL:+RSA:+DHE-RSA:+DHE-DSS:+MAC-ALL"
   "NONE:+VERS-TLS1.0:+CIPHER-ALL:+COMP-ALL:+RSA:+DHE-RSA:+DHE-DSS:+MAC-ALL", NULL);
 



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