[pan2: 267/268] dsfsdf

From: Heinrich MÃller <henmull src gnome org>
To: commits-list gnome org
Cc:
Subject: [pan2: 267/268] dsfsdf
Date: Mon, 2 Jan 2012 16:00:26 +0000 (UTC)
commit b787824c081ce0c8dab024f945041ce99b7802e4
Author: Heinrich MÃller <henmull src gnome org>
Date:   Mon Jan 2 15:51:08 2012 +0100

    dsfsdf

 pan/data/cert-store.cc        |    4 ----
 pan/gui/actions.cc            |    2 +-
 pan/gui/actions.h             |    2 +-
 pan/gui/body-pane.cc          |    5 +++--
 pan/gui/body-pane.h           |    2 +-
 pan/gui/dl-headers-ui.cc      |    2 +-
 pan/gui/dl-headers-ui.h       |    2 +-
 pan/gui/e-action-combo-box.h  |    2 +-
 pan/gui/e-charset.h           |    2 +-
 pan/gui/e-cte-dialog.h        |    2 +-
 pan/gui/group-pane.cc         |    2 +-
 pan/gui/group-pane.h          |    2 +-
 pan/gui/group-prefs-dialog.cc |    2 +-
 pan/gui/group-prefs-dialog.h  |    2 +-
 pan/gui/header-pane.cc        |    2 +-
 pan/gui/header-pane.h         |    2 +-
 pan/gui/hig.cc                |    2 +-
 pan/gui/hig.h                 |    2 +-
 pan/gui/log-ui.cc             |    2 +-
 pan/gui/log-ui.h              |    2 +-
 pan/gui/pan-file-entry.cc     |    2 +-
 pan/gui/pan-file-entry.h      |    2 +-
 pan/gui/pan-tree.h            |    2 +-
 pan/gui/pan.cc                |    2 +-
 pan/gui/post-ui.cc            |    3 +--
 pan/gui/prefs-ui.cc           |    2 +-
 pan/gui/prefs-ui.h            |    2 +-
 pan/gui/prefs.h               |    2 +-
 pan/gui/profiles-dialog.cc    |    2 +-
 pan/gui/profiles-dialog.h     |    2 +-
 pan/gui/progress-view.cc      |    2 +-
 pan/gui/progress-view.h       |    2 +-
 pan/gui/save-attach-ui.cc     |    2 +-
 pan/gui/save-attach-ui.h      |    2 +-
 pan/gui/save-ui.cc            |    2 +-
 pan/gui/save-ui.h             |    2 +-
 pan/gui/score-add-ui.h        |    2 +-
 pan/gui/score-view-ui.cc      |    2 +-
 pan/gui/score-view-ui.h       |    2 +-
 pan/gui/server-ui.cc          |    2 +-
 pan/gui/server-ui.h           |    2 +-
 pan/gui/task-pane.cc          |    2 +-
 pan/gui/task-pane.h           |    2 +-
 pan/tasks/task-upload.cc      |    4 ++--
 44 files changed, 46 insertions(+), 50 deletions(-)
---
diff --git a/pan/data/cert-store.cc b/pan/data/cert-store.cc
index e160f6c..bc93777 100644
--- a/pan/data/cert-store.cc
+++ b/pan/data/cert-store.cc
@@ -178,8 +178,6 @@ namespace pan
     FILE * fp = fopen(filename, "rb");
     if (!fp) return false;
 
-    std::cerr<<"importing cert for server "<<server<<" "<<(filename ? filename : "empty")<<"\n";
-
     fseek (fp, 0, SEEK_END);
     filelen = ftell (fp);
     fseek (fp, 0, SEEK_SET);
@@ -320,8 +318,6 @@ namespace pan
     debug("adding server cert "<<server<<" "<<cert);
     if (!cert || server.empty()) return false;
 
-    std::cerr<<"adding cert for server "<<server<<"\n";
-
     std::string addr; int port;
     _data.get_server_addr(server, addr, port);
     _cert_to_server[server] = cert;
diff --git a/pan/gui/actions.cc b/pan/gui/actions.cc
index f11a6e6..50f8ea6 100644
--- a/pan/gui/actions.cc
+++ b/pan/gui/actions.cc
@@ -20,7 +20,7 @@
 #include <config.h>
 extern "C" {
   #include <glib/gi18n.h>
-  #include <pan/gui/gtk-compat.h>
+  #include "gtk-compat.h"
 }
 #include <pan/general/debug.h>
 #include <pan/tasks/task-xover.h>
diff --git a/pan/gui/actions.h b/pan/gui/actions.h
index c6120ee..a31a3cb 100644
--- a/pan/gui/actions.h
+++ b/pan/gui/actions.h
@@ -19,7 +19,7 @@
 #ifndef _actions_h_
 #define _actions_h_
 
-#include <pan/gui/gtk-compat.h>
+#include "gtk-compat.h"
 #include <pan/gui/pan-ui.h>
 #include <pan/gui/prefs.h>
 
diff --git a/pan/gui/body-pane.cc b/pan/gui/body-pane.cc
index 84a914f..f2e2c9c 100644
--- a/pan/gui/body-pane.cc
+++ b/pan/gui/body-pane.cc
@@ -24,7 +24,7 @@
 #include <sstream>
 extern "C" {
   #include <glib/gi18n.h>
-  #include <pan/gui/gtk-compat.h>
+  #include "gtk-compat.h"
   #include <gmime/gmime.h>
 }
 #include <gdk-pixbuf/gdk-pixbuf.h>
@@ -1010,6 +1010,7 @@ BodyPane :: append_part (GMimeObject * parent, GMimeObject * obj, GtkAllocation
       ? g_strdup_printf ("%s", filename)
       : g_strdup_printf (_("Unnamed File"));
     add_attachment_to_toolbar (pch);
+    std::cerr<<"add attach "<<pch<<"\n";
     _freeme.insert(pch);
   }
 }
@@ -1643,7 +1644,7 @@ BodyPane :: create_attachments_toolbar (GtkWidget* frame)
   _cur_row = 0;
 
   GtkWidget * w = _att_toolbar = gtk_table_new(4,1,TRUE);
-  gtk_widget_set_size_request (w, -1, 20);
+  gtk_widget_set_size_request (w, -1, 40);
   gtk_table_set_col_spacings (GTK_TABLE(w), PAD);
   gtk_container_add (GTK_CONTAINER (frame), w);
   gtk_widget_show_all (frame);
diff --git a/pan/gui/body-pane.h b/pan/gui/body-pane.h
index 1f09bdb..4ae3fa9 100644
--- a/pan/gui/body-pane.h
+++ b/pan/gui/body-pane.h
@@ -20,7 +20,7 @@
 #ifndef _BodyPane_h_
 #define _BodyPane_h_
 
-#include <pan/gui/gtk-compat.h>
+#include "gtk-compat.h"
 #include <gmime/gmime.h>
 #include <pan/general/quark.h>
 #include <pan/usenet-utils/text-massager.h>
diff --git a/pan/gui/dl-headers-ui.cc b/pan/gui/dl-headers-ui.cc
index 7281e47..9922f55 100644
--- a/pan/gui/dl-headers-ui.cc
+++ b/pan/gui/dl-headers-ui.cc
@@ -21,7 +21,7 @@
 extern "C" {
   #include <glib.h>
   #include <glib/gi18n.h>
-  #include <pan/gui/gtk-compat.h>
+  #include "gtk-compat.h"
 }
 #include <pan/general/macros.h>
 #include <pan/tasks/queue.h>
diff --git a/pan/gui/dl-headers-ui.h b/pan/gui/dl-headers-ui.h
index 1376c9a..1aef6c5 100644
--- a/pan/gui/dl-headers-ui.h
+++ b/pan/gui/dl-headers-ui.h
@@ -19,7 +19,7 @@
 #ifndef DOWNLOAD_HEADERS_UI_H
 #define DOWNLOAD_HEADERS_UI_H
 
-#include <pan/gui/gtk-compat.h>
+#include "gtk-compat.h"
 #include <pan/general/quark.h>
 #include "prefs.h"
 
diff --git a/pan/gui/e-action-combo-box.h b/pan/gui/e-action-combo-box.h
index 1c84f4e..bcf22c9 100644
--- a/pan/gui/e-action-combo-box.h
+++ b/pan/gui/e-action-combo-box.h
@@ -25,7 +25,7 @@
  * Just plug in a GtkRadioAction and the widget will handle the rest.
  * (Based on GtkhtmlComboBox.) */
 
-#include <pan/gui/gtk-compat.h>
+#include "gtk-compat.h"
 
 /* Standard GObject macros */
 #define E_TYPE_ACTION_COMBO_BOX \
diff --git a/pan/gui/e-charset.h b/pan/gui/e-charset.h
index 4b3b372..833ba1f 100644
--- a/pan/gui/e-charset.h
+++ b/pan/gui/e-charset.h
@@ -21,7 +21,7 @@
 #ifndef E_CHARSET_H
 #define E_CHARSET_H
 
-#include <pan/gui/gtk-compat.h>
+#include "gtk-compat.h"
 
 G_BEGIN_DECLS
 
diff --git a/pan/gui/e-cte-dialog.h b/pan/gui/e-cte-dialog.h
index 268bd1d..90cb6d0 100644
--- a/pan/gui/e-cte-dialog.h
+++ b/pan/gui/e-cte-dialog.h
@@ -3,7 +3,7 @@
 
 #include <config.h>
 #include <gmime/gmime.h>
-#include <pan/gui/gtk-compat.h>
+#include "gtk-compat.h"
 #include <glib/gi18n.h>
 
 G_BEGIN_DECLS
diff --git a/pan/gui/group-pane.cc b/pan/gui/group-pane.cc
index 4ad151d..ddc4cc9 100644
--- a/pan/gui/group-pane.cc
+++ b/pan/gui/group-pane.cc
@@ -22,7 +22,7 @@
 #include <deque>
 extern "C" {
   #include <glib/gi18n.h>
-  #include <pan/gui/gtk-compat.h>
+  #include "gtk-compat.h"
 }
 #include <pan/general/debug.h>
 //#include <pan/general/gdk-threads.h>
diff --git a/pan/gui/group-pane.h b/pan/gui/group-pane.h
index 9c3ce54..56842d0 100644
--- a/pan/gui/group-pane.h
+++ b/pan/gui/group-pane.h
@@ -20,7 +20,7 @@
 #ifndef _GroupPane_h_
 #define _GroupPane_h_
 
-#include <pan/gui/gtk-compat.h>
+#include "gtk-compat.h"
 #include <pan/general/quark.h>
 #include <pan/data/data.h>
 #include <pan/gui/action-manager.h>
diff --git a/pan/gui/group-prefs-dialog.cc b/pan/gui/group-prefs-dialog.cc
index 0f56ce7..3b87d90 100644
--- a/pan/gui/group-prefs-dialog.cc
+++ b/pan/gui/group-prefs-dialog.cc
@@ -21,7 +21,7 @@
 extern "C" {
   #include <glib/gi18n.h>
   #include <glib.h>
-  #include <pan/gui/gtk-compat.h>
+  #include "gtk-compat.h"
 #ifdef HAVE_GTKSPELL
   #include <gtkspell/gtkspell.h>
   #include <enchant/enchant.h>
diff --git a/pan/gui/group-prefs-dialog.h b/pan/gui/group-prefs-dialog.h
index aae7a82..a42f800 100644
--- a/pan/gui/group-prefs-dialog.h
+++ b/pan/gui/group-prefs-dialog.h
@@ -22,7 +22,7 @@
 
 #include <pan/general/quark.h>
 #include <pan/data/data.h>
-#include <pan/gui/gtk-compat.h>
+#include "gtk-compat.h"
 #include "group-prefs.h"
 
 namespace pan
diff --git a/pan/gui/header-pane.cc b/pan/gui/header-pane.cc
index eab9fdb..7e18832 100644
--- a/pan/gui/header-pane.cc
+++ b/pan/gui/header-pane.cc
@@ -20,7 +20,7 @@
 extern "C" {
   #include <config.h>
   #include <glib/gi18n.h>
-  #include <pan/gui/gtk-compat.h>
+  #include "gtk-compat.h"
   #include "gtk-compat.h"
   #include <iconv.h>
 }
diff --git a/pan/gui/header-pane.h b/pan/gui/header-pane.h
index 7636db2..9bfeb8d 100644
--- a/pan/gui/header-pane.h
+++ b/pan/gui/header-pane.h
@@ -20,7 +20,7 @@
 #ifndef _HeaderPane_h_
 #define _HeaderPane_h_
 
-#include <pan/gui/gtk-compat.h>
+#include "gtk-compat.h"
 #include <pan/general/e-util.h>
 #include <pan/general/macros.h> // for UNUSED
 #include <pan/data/article-cache.h>
diff --git a/pan/gui/hig.cc b/pan/gui/hig.cc
index 0dbdcfc..b855d0b 100644
--- a/pan/gui/hig.cc
+++ b/pan/gui/hig.cc
@@ -19,7 +19,7 @@
 
 #include <config.h>
 #include <glib.h>
-#include <pan/gui/gtk-compat.h>
+#include "gtk-compat.h"
 #include "hig.h"
 
 #include <iostream>
diff --git a/pan/gui/hig.h b/pan/gui/hig.h
index 7ae7ece..7b064ad 100644
--- a/pan/gui/hig.h
+++ b/pan/gui/hig.h
@@ -20,7 +20,7 @@
 #ifndef _HIG_h_
 #define _HIG_h_
 
-#include <pan/gui/gtk-compat.h>
+#include "gtk-compat.h"
 
 namespace pan
 {
diff --git a/pan/gui/log-ui.cc b/pan/gui/log-ui.cc
index 8555c1d..bef9446 100644
--- a/pan/gui/log-ui.cc
+++ b/pan/gui/log-ui.cc
@@ -23,7 +23,7 @@
 #include <iostream>
 extern "C" {
   #include <glib/gi18n.h>
-  #include <pan/gui/gtk-compat.h>
+  #include "gtk-compat.h"
 }
 #include <pan/general/log.h>
 #include <pan/general/macros.h>
diff --git a/pan/gui/log-ui.h b/pan/gui/log-ui.h
index 59d1bce..a885178 100644
--- a/pan/gui/log-ui.h
+++ b/pan/gui/log-ui.h
@@ -19,7 +19,7 @@
 #ifndef LOG_UI_H
 #define LOG_UI_H
 
-#include <pan/gui/gtk-compat.h>
+#include "gtk-compat.h"
 #include "prefs.h"
 
 namespace pan
diff --git a/pan/gui/pan-file-entry.cc b/pan/gui/pan-file-entry.cc
index 93bb7e5..9e9405d 100644
--- a/pan/gui/pan-file-entry.cc
+++ b/pan/gui/pan-file-entry.cc
@@ -21,7 +21,7 @@
 #include <string>
 extern "C" {
   #include <glib/gi18n.h>
-  #include <pan/gui/gtk-compat.h>
+  #include "gtk-compat.h"
 }
 #include <pan/general/file-util.h>
 #include "pad.h"
diff --git a/pan/gui/pan-file-entry.h b/pan/gui/pan-file-entry.h
index 1573dc9..6e09493 100644
--- a/pan/gui/pan-file-entry.h
+++ b/pan/gui/pan-file-entry.h
@@ -20,7 +20,7 @@
 #ifndef __PanFileEntry_h__
 #define __PanFileEntry_h__
 
-#include <pan/gui/gtk-compat.h>
+#include "gtk-compat.h"
 
 namespace pan
 {
diff --git a/pan/gui/pan-tree.h b/pan/gui/pan-tree.h
index a7d16e3..8ef0cb5 100644
--- a/pan/gui/pan-tree.h
+++ b/pan/gui/pan-tree.h
@@ -22,7 +22,7 @@
 
 #include <map>
 #include <vector>
-#include <pan/gui/gtk-compat.h>
+#include "gtk-compat.h"
 
 #define PAN_TREE_STORE_TYPE (PanTreeStore::get_type())
 #define PAN_TREE_STORE(obj) \
diff --git a/pan/gui/pan.cc b/pan/gui/pan.cc
index 3392db7..fd85c70 100644
--- a/pan/gui/pan.cc
+++ b/pan/gui/pan.cc
@@ -27,7 +27,7 @@
 
 extern "C" {
   #include <glib/gi18n.h>
-  #include <pan/gui/gtk-compat.h>
+  #include "gtk-compat.h"
   #include <gmime/gmime.h>
   #include <gio/gio.h>
   #include <sys/types.h>
diff --git a/pan/gui/post-ui.cc b/pan/gui/post-ui.cc
index bee9ef7..00abb48 100644
--- a/pan/gui/post-ui.cc
+++ b/pan/gui/post-ui.cc
@@ -25,7 +25,6 @@
 extern "C" {
   #include <gmime/gmime.h>
   #include <glib/gi18n.h>
-  #include <pan/gui/gtk-compat.h>
   #include "gtk-compat.h"
   #include <sys/time.h>
 #ifdef HAVE_GTKSPELL
@@ -1575,7 +1574,7 @@ PostUI :: new_message_from_ui (Mode mode, bool copy_body)
     g_free (pch);
     g_mime_object_set_content_type ((GMimeObject *) part, type); // part owns type now. type isn't refcounted.
     g_mime_part_set_content_object (part, content_object);
-    g_mime_part_set_content_encoding (part, _enc);
+    if (mode != UPLOADING) g_mime_part_set_content_encoding (part, _enc);
     g_object_unref (content_object);
     g_mime_message_set_mime_part (msg, GMIME_OBJECT(part));
     g_object_unref (part);
diff --git a/pan/gui/prefs-ui.cc b/pan/gui/prefs-ui.cc
index e4d13e9..823314d 100644
--- a/pan/gui/prefs-ui.cc
+++ b/pan/gui/prefs-ui.cc
@@ -20,7 +20,7 @@
 #include <config.h>
 extern "C" {
   #include <glib/gi18n.h>
-  #include <pan/gui/gtk-compat.h>
+  #include "gtk-compat.h"
 }
 #include <pan/general/debug.h>
 #include <pan/general/macros.h>
diff --git a/pan/gui/prefs-ui.h b/pan/gui/prefs-ui.h
index f409348..ea7bc83 100644
--- a/pan/gui/prefs-ui.h
+++ b/pan/gui/prefs-ui.h
@@ -20,7 +20,7 @@
 #ifndef PREFS_UI_H
 #define PREFS_UI_H
 
-#include <pan/gui/gtk-compat.h>
+#include "gtk-compat.h"
 #include <pan/gui/prefs.h>
 
 namespace pan
diff --git a/pan/gui/prefs.h b/pan/gui/prefs.h
index 4a76b32..8002669 100644
--- a/pan/gui/prefs.h
+++ b/pan/gui/prefs.h
@@ -26,7 +26,7 @@
 #include <string>
 #include <vector>
 #include <pan/general/string-view.h>
-#include <pan/gui/gtk-compat.h>
+#include "gtk-compat.h"
 
 namespace pan
 {
diff --git a/pan/gui/profiles-dialog.cc b/pan/gui/profiles-dialog.cc
index 139eead..62768c2 100644
--- a/pan/gui/profiles-dialog.cc
+++ b/pan/gui/profiles-dialog.cc
@@ -25,7 +25,7 @@
 #include <iostream>
 extern "C" {
   #include <glib/gi18n.h>
-  #include <pan/gui/gtk-compat.h>
+  #include "gtk-compat.h"
 }
 #include <pan/general/debug.h>
 #include <pan/general/macros.h>
diff --git a/pan/gui/profiles-dialog.h b/pan/gui/profiles-dialog.h
index 1c4a9fa..7e9bd05 100644
--- a/pan/gui/profiles-dialog.h
+++ b/pan/gui/profiles-dialog.h
@@ -20,7 +20,7 @@
 #ifndef __ProfilesDialog_h__
 #define __ProfilesDialog_h__
 
-#include <pan/gui/gtk-compat.h>
+#include "gtk-compat.h"
 #include <pan/data/data.h>
 
 namespace pan
diff --git a/pan/gui/progress-view.cc b/pan/gui/progress-view.cc
index 9bf2daf..1c88b76 100644
--- a/pan/gui/progress-view.cc
+++ b/pan/gui/progress-view.cc
@@ -19,7 +19,7 @@
 
 #include <config.h>
 extern "C" {
-  #include <pan/gui/gtk-compat.h>
+  #include "gtk-compat.h"
 }
 #include <pan/general/string-view.h>
 #include <pan/usenet-utils/mime-utils.h>
diff --git a/pan/gui/progress-view.h b/pan/gui/progress-view.h
index 3549918..5449f90 100644
--- a/pan/gui/progress-view.h
+++ b/pan/gui/progress-view.h
@@ -20,7 +20,7 @@
 #ifndef __Progress_View_h__
 #define __Progress_View_h__
 
-#include <pan/gui/gtk-compat.h>
+#include "gtk-compat.h"
 #include <pan/general/progress.h>
 
 namespace pan
diff --git a/pan/gui/save-attach-ui.cc b/pan/gui/save-attach-ui.cc
index c48d37b..1c389cf 100644
--- a/pan/gui/save-attach-ui.cc
+++ b/pan/gui/save-attach-ui.cc
@@ -20,7 +20,7 @@
 #include <config.h>
 extern "C" {
   #include <glib/gi18n.h>
-  #include <pan/gui/gtk-compat.h>
+  #include "gtk-compat.h"
 }
 #include <pan/general/debug.h>
 #include <pan/general/macros.h>
diff --git a/pan/gui/save-attach-ui.h b/pan/gui/save-attach-ui.h
index 1f74909..a1beb24 100644
--- a/pan/gui/save-attach-ui.h
+++ b/pan/gui/save-attach-ui.h
@@ -27,7 +27,7 @@
 #include <pan/data/article-cache.h>
 #include <pan/data/data.h>
 #include <pan/tasks/task-article.h>
-#include <pan/gui/gtk-compat.h>
+#include "gtk-compat.h"
 #include "group-prefs.h"
 #include "prefs.h"
 
diff --git a/pan/gui/save-ui.cc b/pan/gui/save-ui.cc
index f661596..e19ce39 100644
--- a/pan/gui/save-ui.cc
+++ b/pan/gui/save-ui.cc
@@ -20,7 +20,7 @@
 #include <config.h>
 extern "C" {
   #include <glib/gi18n.h>
-  #include <pan/gui/gtk-compat.h>
+  #include "gtk-compat.h"
 }
 #include <pan/general/debug.h>
 #include <pan/general/macros.h>
diff --git a/pan/gui/save-ui.h b/pan/gui/save-ui.h
index a9aba4f..6071440 100644
--- a/pan/gui/save-ui.h
+++ b/pan/gui/save-ui.h
@@ -26,7 +26,7 @@
 #include <pan/data/article.h>
 #include <pan/data/article-cache.h>
 #include <pan/data/data.h>
-#include <pan/gui/gtk-compat.h>
+#include "gtk-compat.h"
 #include "group-prefs.h"
 #include "prefs.h"
 
diff --git a/pan/gui/score-add-ui.h b/pan/gui/score-add-ui.h
index de0c9e2..eb26432 100644
--- a/pan/gui/score-add-ui.h
+++ b/pan/gui/score-add-ui.h
@@ -1,7 +1,7 @@
 #ifndef __SCORE_ADD_UI_H__
 #define __SCORE_ADD_UI_H__
 
-#include <pan/gui/gtk-compat.h>
+#include "gtk-compat.h"
 #include <pan/data/article.h>
 #include <pan/data/data.h>
 
diff --git a/pan/gui/score-view-ui.cc b/pan/gui/score-view-ui.cc
index a82b700..f351932 100644
--- a/pan/gui/score-view-ui.cc
+++ b/pan/gui/score-view-ui.cc
@@ -20,7 +20,7 @@
 #include <config.h>
 extern "C" {
   #include <glib/gi18n.h>
-  #include <pan/gui/gtk-compat.h>
+  #include "gtk-compat.h"
 }
 #include <pan/general/debug.h>
 #include "pad.h"
diff --git a/pan/gui/score-view-ui.h b/pan/gui/score-view-ui.h
index b96cb16..80a53ac 100644
--- a/pan/gui/score-view-ui.h
+++ b/pan/gui/score-view-ui.h
@@ -20,7 +20,7 @@
 #define _ScoreViewUI_h_
 
 #include <vector>
-#include <pan/gui/gtk-compat.h>
+#include "gtk-compat.h"
 #include <pan/general/quark.h>
 #include <pan/usenet-utils/scorefile.h>
 #include <pan/data/article.h>
diff --git a/pan/gui/server-ui.cc b/pan/gui/server-ui.cc
index db2fc26..3c515c7 100644
--- a/pan/gui/server-ui.cc
+++ b/pan/gui/server-ui.cc
@@ -24,7 +24,7 @@
 extern "C" {
   #include <glib.h>
   #include <glib/gi18n.h>
-  #include <pan/gui/gtk-compat.h>
+  #include "gtk-compat.h"
 }
 
 #include <pan/icons/pan-pixbufs.h>
diff --git a/pan/gui/server-ui.h b/pan/gui/server-ui.h
index 07ed026..12211ea 100644
--- a/pan/gui/server-ui.h
+++ b/pan/gui/server-ui.h
@@ -21,7 +21,7 @@
 #define SERVER_UI_H
 
 #include <set>
-#include <pan/gui/gtk-compat.h>
+#include "gtk-compat.h"
 #include <pan/data/data.h>
 #include <pan/tasks/queue.h>
 
diff --git a/pan/gui/task-pane.cc b/pan/gui/task-pane.cc
index b046557..f686c04 100644
--- a/pan/gui/task-pane.cc
+++ b/pan/gui/task-pane.cc
@@ -21,7 +21,7 @@
 extern "C" {
   #include <glib.h>
   #include <glib/gi18n.h>
-  #include <pan/gui/gtk-compat.h>
+  #include "gtk-compat.h"
 }
 #include <pan/general/e-util.h>
 #include <pan/general/debug.h>
diff --git a/pan/gui/task-pane.h b/pan/gui/task-pane.h
index 09907e8..736e495 100644
--- a/pan/gui/task-pane.h
+++ b/pan/gui/task-pane.h
@@ -20,7 +20,7 @@
 #ifndef TASK_MANAGER_H
 #define TASK_MANAGER_H
 
-#include <pan/gui/gtk-compat.h>
+#include "gtk-compat.h"
 #include <vector>
 #include <pan/tasks/task.h>
 #include <pan/tasks/queue.h>
diff --git a/pan/tasks/task-upload.cc b/pan/tasks/task-upload.cc
index d4b1f99..a8502fc 100644
--- a/pan/tasks/task-upload.cc
+++ b/pan/tasks/task-upload.cc
@@ -100,10 +100,10 @@ TaskUpload :: TaskUpload (const std::string         & filename,
   _encoder_has_run (false),
   _all_bytes(0),
   _bpf(format.bpf),
-  _queue_pos(0),
-  _msg (msg),
   _total_parts(format.total),
   _save_file(format.save_file),
+  _queue_pos(0),
+  _msg (msg),
   _first(true),
   _paused(true),
   _groups(get_groups_str(article))
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]