[pan2] bump revision number / minor docu revision

[Heinrich MÃller <henmull src gnome org>]

commit cee3ac7ae8e00d85b5f7fc4a04c4ea130b8e027a
Author: Heinrich MÃller <henmull src gnome org>
Date:   Sun Apr 22 13:55:51 2012 +0200

    bump revision number / minor docu revision

 configure.in    |    2 +-
 pan/data/data.h |    1 -
 pan/gui/pan.cc  |   28 ++++++++++++++--------------
 3 files changed, 15 insertions(+), 16 deletions(-)
---
diff --git a/configure.in b/configure.in
index 6edf094..b2486ef 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 AC_INIT([Pan],[0.136],[https://bugzilla.gnome.org/enter_bug.cgi?product=Pan],[pan],[http://pan.rebelbase.com/])
 AC_DEFINE(VERSION_MAJOR,0,[Major part of version number])
 AC_DEFINE(VERSION_MINOR,136,[Minor part of version number])
-AC_DEFINE(VERSION_REVISION,0,[Revision part of version number])
+AC_DEFINE(VERSION_REVISION,1,[Revision part of version number])
 AC_DEFINE(VERSION_TITLE,["I'm far too busy being delicious"],[Release Name])
 AC_PREREQ([2.64])
 
diff --git a/pan/data/data.h b/pan/data/data.h
index c7d40fd..fe3fdb4 100644
--- a/pan/data/data.h
+++ b/pan/data/data.h
@@ -591,7 +591,6 @@ namespace pan
        virtual void rescore () = 0;
 
     public:
-
       void set_queue (Queue* q) { _queue = q; }
       Queue* get_queue () { return _queue; }
 
diff --git a/pan/gui/pan.cc b/pan/gui/pan.cc
index 1169b1b..e3be7d4 100644
--- a/pan/gui/pan.cc
+++ b/pan/gui/pan.cc
@@ -669,7 +669,7 @@ _("General Options\n"
     Pan* pan(static_cast<Pan*>(user_data));
     if (!pan) return;
 
-    gboolean gui(false), nzb(false);
+    gboolean nzb(false);
     gchar* groups;
     gchar* nzb_output_path;
     gchar* nzbs;
@@ -677,19 +677,18 @@ _("General Options\n"
 
     if (g_strcmp0 (method_name, "NZBEnqueue") == 0)
     {
-      g_variant_get (parameters, "(sssbb)", &groups, &nzb_output_path, &nzbs, &gui, &nzb);
+      g_variant_get (parameters, "(sssb)", &groups, &nzb_output_path, &nzbs, &nzb);
 
-      if (groups)
-        if (strlen(groups)!=0)
-        {
-          StringView tok, v(groups);
-          while (v.pop_token(tok,','))
-            pan->queue.add_task (new TaskXOver (pan->data, tok, TaskXOver::NEW), Queue::BOTTOM);
-        }
+      if (groups && strlen(groups)!=0)
+      {
+        StringView tok, v(groups);
+        while (v.pop_token(tok,','))
+          pan->queue.add_task (new TaskXOver (pan->data, tok, TaskXOver::NEW), Queue::BOTTOM);
+      }
 
       if (nzb && nzbs)
       {
-        //parse the files
+        //parse the file list
         StringView tok, nzb(nzbs);
         while (nzb.pop_token(tok))
           nzb_files.push_back(tok);
@@ -714,7 +713,6 @@ _("General Options\n"
   "      <arg type='s' name='groups'    direction='in'/>"
   "      <arg type='s' name='nzb_files' direction='in'/>"
   "      <arg type='s' name='nzb_path'  direction='in'/>"
-  "      <arg type='b' name='gui'       direction='in'/>"
   "      <arg type='b' name='nzb'       direction='in'/>"
   "    </method>"
   "  </interface>"
@@ -915,8 +913,7 @@ main (int argc, char *argv[])
     WorkerPool worker_pool (4, true);
     SocketCreator socket_creator(data, certstore);
     Queue queue (data, data, &socket_creator, certstore, worker_pool, false, 32768);
-
-    data.set_queue(&queue);
+    data.set_queue (&queue);
 
 #ifdef HAVE_DBUS
     Pan pan(data, queue, cache, encode_cache, prefs, group_prefs);
@@ -936,7 +933,7 @@ main (int argc, char *argv[])
                                PAN_DBUS_SERVICE_PATH,
                                "news.pan.NZB",
                                "NZBEnqueue",
-                               g_variant_new ("(sssbb)",
+                               g_variant_new ("(sssb)",
                                   groups.c_str(), nzb_output_path.c_str(), nzb_str.c_str(),  gui, nzb),
                                NULL,
                                G_DBUS_CALL_FLAGS_NONE,
@@ -958,6 +955,8 @@ main (int argc, char *argv[])
   #endif
     _fail:
 #endif
+
+    // set queue prefs _after_ initializing dbus
     queue.set_online(true);
     queue.set_task_save_delay(prefs.get_int ("task-save-delay-secs", 10));
 
@@ -1035,6 +1034,7 @@ main (int argc, char *argv[])
       run_pan_in_window (gui_ptr, data, queue, prefs, group_prefs, GTK_WINDOW(window));
     }
 
+    // free status icons
     for (guint i=0; i<NUM_STATUS_ICONS; ++i)
       g_object_unref(status_icons[i].pixbuf);
     delete _status_icon;