[pan2/new_master: 263/266] sfdsdfds

From: Heinrich MÃller <henmull src gnome org>
To: commits-list gnome org
Cc:
Subject: [pan2/new_master: 263/266] sfdsdfds
Date: Mon, 2 Jan 2012 14:11:54 +0000 (UTC)
commit 3a70a13806d87071cf8090ebb09b3684922bada6
Author: Heinrich MÃller <henmull src gnome org>
Date:   Mon Jan 2 13:14:22 2012 +0100

    sfdsdfds

 pan/gui/actions.cc            |    2 +-
 pan/gui/actions.h             |    2 +-
 pan/gui/body-pane.cc          |    3 +--
 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  |    5 ++++-
 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/gtk-compat.h          |    3 +++
 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            |   10 +++++-----
 pan/gui/pan.cc                |    2 +-
 pan/gui/post-ui.cc            |   41 +++++++++++++++++++++++++++++------------
 pan/gui/post-ui.h             |    2 +-
 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       |    4 ++--
 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             |    4 ++--
 pan/gui/score-add-ui.h        |    4 ++--
 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 +-
 44 files changed, 84 insertions(+), 62 deletions(-)
---
diff --git a/pan/gui/actions.cc b/pan/gui/actions.cc
index 60876a2..0a61680 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 <gtk/gtk.h>
+  #include <pan/gui/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 75c15cf..c6120ee 100644
--- a/pan/gui/actions.h
+++ b/pan/gui/actions.h
@@ -19,7 +19,7 @@
 #ifndef _actions_h_
 #define _actions_h_
 
-#include <gtk/gtk.h>
+#include <pan/gui/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 6209f1b..1f432b4 100644
--- a/pan/gui/body-pane.cc
+++ b/pan/gui/body-pane.cc
@@ -24,8 +24,7 @@
 #include <sstream>
 extern "C" {
   #include <glib/gi18n.h>
-  #include <gtk/gtk.h>
-  #include <gdk/gdk.h>
+  #include <pan/gui/gtk-compat.h>
   #include "gtk-compat.h"
   #include <gmime/gmime.h>
 }
diff --git a/pan/gui/body-pane.h b/pan/gui/body-pane.h
index 96918fd..1f09bdb 100644
--- a/pan/gui/body-pane.h
+++ b/pan/gui/body-pane.h
@@ -20,7 +20,7 @@
 #ifndef _BodyPane_h_
 #define _BodyPane_h_
 
-#include <gtk/gtk.h>
+#include <pan/gui/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 1c585a2..7281e47 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 <gtk/gtk.h>
+  #include <pan/gui/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 19c2b88..1376c9a 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 <gtk/gtk.h>
+#include <pan/gui/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 3003386..1c84f4e 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 <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
 
 /* Standard GObject macros */
 #define E_TYPE_ACTION_COMBO_BOX \
@@ -55,6 +55,9 @@ typedef struct _EActionComboBoxPrivate EActionComboBoxPrivate;
 struct _EActionComboBox {
 	GtkComboBox parent;
 	EActionComboBoxPrivate *priv;
+	// quick fix for error : "specified instance size for type `EActionComboBox' is
+  // smaller than the parent type's `GtkComboBox' instance size"
+	double pad;
 };
 
 struct _EActionComboBoxClass {
diff --git a/pan/gui/e-charset.h b/pan/gui/e-charset.h
index 57b6976..4b3b372 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 <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
 
 G_BEGIN_DECLS
 
diff --git a/pan/gui/e-cte-dialog.h b/pan/gui/e-cte-dialog.h
index 5bd5100..268bd1d 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 <gtk/gtk.h>
+#include <pan/gui/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 0b1e563..4ad151d 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 <gtk/gtk.h>
+  #include <pan/gui/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 0e77866..9c3ce54 100644
--- a/pan/gui/group-pane.h
+++ b/pan/gui/group-pane.h
@@ -20,7 +20,7 @@
 #ifndef _GroupPane_h_
 #define _GroupPane_h_
 
-#include <gtk/gtk.h>
+#include <pan/gui/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 bb02516..0f56ce7 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 <gtk/gtk.h>
+  #include <pan/gui/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 63f7323..aae7a82 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 <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
 #include "group-prefs.h"
 
 namespace pan
diff --git a/pan/gui/gtk-compat.h b/pan/gui/gtk-compat.h
index d9c83ca..62d0ae4 100644
--- a/pan/gui/gtk-compat.h
+++ b/pan/gui/gtk-compat.h
@@ -14,6 +14,9 @@
 #ifndef PAN_GTK_COMPAT_H
 #define PAN_GTK_COMPAT_H
 
+#include <gtk/gtk.h>
+#include <gdk/gdk.h>
+
 #ifdef __cplusplus
 namespace
 {
diff --git a/pan/gui/header-pane.cc b/pan/gui/header-pane.cc
index 1d888b1..eab9fdb 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 <gtk/gtk.h>
+  #include <pan/gui/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 c318b8f..7636db2 100644
--- a/pan/gui/header-pane.h
+++ b/pan/gui/header-pane.h
@@ -20,7 +20,7 @@
 #ifndef _HeaderPane_h_
 #define _HeaderPane_h_
 
-#include <gtk/gtk.h>
+#include <pan/gui/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 5ca6381..0dbdcfc 100644
--- a/pan/gui/hig.cc
+++ b/pan/gui/hig.cc
@@ -19,7 +19,7 @@
 
 #include <config.h>
 #include <glib.h>
-#include <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
 #include "hig.h"
 
 #include <iostream>
diff --git a/pan/gui/hig.h b/pan/gui/hig.h
index 265530b..7ae7ece 100644
--- a/pan/gui/hig.h
+++ b/pan/gui/hig.h
@@ -20,7 +20,7 @@
 #ifndef _HIG_h_
 #define _HIG_h_
 
-#include <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
 
 namespace pan
 {
diff --git a/pan/gui/log-ui.cc b/pan/gui/log-ui.cc
index 744aa39..8555c1d 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 <gtk/gtk.h>
+  #include <pan/gui/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 ff59a89..59d1bce 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 <gtk/gtk.h>
+#include <pan/gui/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 a732bbb..93bb7e5 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 <gtk/gtk.h>
+  #include <pan/gui/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 fed7359..1573dc9 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 <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
 
 namespace pan
 {
diff --git a/pan/gui/pan-tree.h b/pan/gui/pan-tree.h
index 7bafb96..a7d16e3 100644
--- a/pan/gui/pan-tree.h
+++ b/pan/gui/pan-tree.h
@@ -22,7 +22,7 @@
 
 #include <map>
 #include <vector>
-#include <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
 
 #define PAN_TREE_STORE_TYPE (PanTreeStore::get_type())
 #define PAN_TREE_STORE(obj) \
@@ -75,7 +75,7 @@ struct PanTreeStoreClass
  *  6. Entire subtrees can be reparented in a single call.
  *
  *
- * WARTS 
+ * WARTS
  *
  *  _  Sorting is not triggered when a row changes.
  *     When you're done with a batch of changes, call sort() manually.
@@ -334,7 +334,7 @@ struct PanTreeStore
     /** one of GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
                GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID,
                or [0...n_columns) */
-    int sort_column_id; 
+    int sort_column_id;
 
     /** the model's sort order -- ascending or descending */
     GtkSortType order;
@@ -376,7 +376,7 @@ struct PanTreeStore
         passed as arguments to us actually do belong to this tree. */
     int stamp;
 
-    /** Defines the GType of each column. */    
+    /** Defines the GType of each column. */
     std::vector<GType> * column_types;
 
     /** number of columns in each row. */
@@ -442,7 +442,7 @@ struct PanTreeStore
                                                     gpointer,
                                                     GDestroyNotify);
     static gboolean sortable_has_default_sort_func (GtkTreeSortable*);
- 
+
   private:
     struct SortData;
     struct SortRowInfo;
diff --git a/pan/gui/pan.cc b/pan/gui/pan.cc
index a0d2e9a..3392db7 100644
--- a/pan/gui/pan.cc
+++ b/pan/gui/pan.cc
@@ -27,7 +27,7 @@
 
 extern "C" {
   #include <glib/gi18n.h>
-  #include <gtk/gtk.h>
+  #include <pan/gui/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 8810eb2..bee9ef7 100644
--- a/pan/gui/post-ui.cc
+++ b/pan/gui/post-ui.cc
@@ -25,7 +25,7 @@
 extern "C" {
   #include <gmime/gmime.h>
   #include <glib/gi18n.h>
-  #include <gtk/gtk.h>
+  #include <pan/gui/gtk-compat.h>
   #include "gtk-compat.h"
   #include <sys/time.h>
 #ifdef HAVE_GTKSPELL
@@ -204,15 +204,22 @@ PostUI :: on_queue_tasks_added (UploadQueue& queue, int index, int count)
   for (int i=0; i<count; ++i)
   {
     const int pos (index + i);
+
     TaskUpload * task (dynamic_cast<TaskUpload*>(_upload_queue[pos]));
     if (!task) continue;
+
     GtkTreeIter iter;
     gtk_list_store_insert (store, &iter, pos);
+
+    float size = task->_bytes/1024.0f;
+    char numbuf[256];
+    g_snprintf(numbuf,sizeof(numbuf), "%.2f", size);
+
     gtk_list_store_set (store, &iter,
                       0, pos+1,
                       1, task->_subject.c_str(),
                       2, task,
-                      3, task->_bytes/1024.0f,
+                      3, numbuf,
                       -1);
   }
   gtk_tree_view_set_model(GTK_TREE_VIEW(_filequeue_store), model);
@@ -1050,16 +1057,21 @@ PostUI :: maybe_post_message (GMimeMessage * message)
 
   gtk_widget_hide (_root);
 
+  GMimeMessage* msg = new_message_from_ui(POSTING);
+
   if(_file_queue_empty)
   {
-
-    GMimeMessage* msg = new_message_from_ui(POSTING);
     bool go_on(true);
 
     /* adding yourself to the list of recipients */
-    GPtrArray * rcp = g_ptr_array_new();
+    GPtrArray * rcp;
     Profile p(get_current_profile());
-    g_ptr_array_add(rcp, (gpointer)p.gpg_sig_uid.c_str());
+
+    if (user_has_gpg)
+    {
+      rcp = g_ptr_array_new();
+      g_ptr_array_add(rcp, (gpointer)p.gpg_sig_uid.c_str());
+    }
 
     if (user_has_gpg && gpg_sign && !gpg_enc)
       go_on = go_on && message_add_signed_part(p.gpg_sig_uid, get_body(), msg);
@@ -1088,8 +1100,6 @@ PostUI :: maybe_post_message (GMimeMessage * message)
 
     std::vector<Task*> tasks;
     _upload_queue.get_all_tasks(tasks);
-    int cnt(0);
-    char buf[2048];
     struct stat sb;
     _running_uploads = tasks.size();
     if (master_reply) ++_running_uploads;
@@ -1104,7 +1114,7 @@ PostUI :: maybe_post_message (GMimeMessage * message)
     StringView domain;
       const char * pch = d2.strchr ('@');
       if (pch != NULL)
-         domain = d2.substr (pch+1, NULL);
+        domain = d2.substr (pch+1, NULL);
       else
         domain = d2;
 
@@ -1129,17 +1139,26 @@ PostUI :: maybe_post_message (GMimeMessage * message)
       n.mid = out;
 
       {
-        TaskUpload * tmp = new TaskUpload(a.subject.to_string(),profile.posting_server,_cache,a,f,new_message_from_ui(UPLOADING));
+        TaskUpload * tmp = new TaskUpload(a.subject.to_string(),profile.posting_server,_cache,a,f,msg);
         tmp->_needed.insert(std::pair<int, TaskUpload::Needed>(1,n));
         tmp->_queue_pos = -1;
         _queue.add_task (tmp, Queue::BOTTOM);
         tmp->add_listener(this);
       }
     }
+    else
+    {
+      g_object_unref(G_OBJECT(msg));
+    }
+
 
     /* init taskupload variables before adding the tasks to the queue for processing */
 
     {
+
+      char buf[2048];
+      int cnt(0);
+
       foreach (PostUI::tasks_t, tasks, it)
       {
 
@@ -2464,8 +2483,6 @@ PostUI :: create_filequeue_tab ()
   gtk_tree_view_insert_column_with_data_func(t, 2, (_("Filename")), renderer, render_filename, 0, 0);
   renderer = gtk_cell_renderer_text_new ();
   gtk_tree_view_insert_column_with_attributes (t, 3, (_("Size (kB)")),renderer,"text", 3,NULL);
-//  renderer = gtk_cell_renderer_text_new ();
-//  gtk_tree_view_insert_column_with_attributes (t, 4, (_("Encode Mode")),renderer,"text", 4,NULL);
 
   // connect signals for popup menu
   g_signal_connect (w, "popup-menu", G_CALLBACK(on_popup_menu), this);
diff --git a/pan/gui/post-ui.h b/pan/gui/post-ui.h
index 05fef71..6739165 100644
--- a/pan/gui/post-ui.h
+++ b/pan/gui/post-ui.h
@@ -178,7 +178,7 @@ namespace pan
       void add_actions (GtkWidget* box);
       void apply_profile_to_body ();
       void apply_profile_to_headers ();
-      enum Mode { DRAFTING, POSTING, UPLOADING, MULTI};
+      enum Mode { DRAFTING, POSTING, UPLOADING};
       GMimeMessage * new_message_from_ui (Mode mode, bool copy_body=true);
       bool check_message (const Quark& server, GMimeMessage*, bool binpost=false);
       bool check_charset ();
diff --git a/pan/gui/prefs-ui.cc b/pan/gui/prefs-ui.cc
index 2afe890..e4d13e9 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 <gtk/gtk.h>
+  #include <pan/gui/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 6988e75..f409348 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 <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
 #include <pan/gui/prefs.h>
 
 namespace pan
diff --git a/pan/gui/prefs.h b/pan/gui/prefs.h
index aa6ee92..8e23e9c 100644
--- a/pan/gui/prefs.h
+++ b/pan/gui/prefs.h
@@ -28,7 +28,7 @@
 #include <pan/general/string-view.h>
 extern "C"
 {
-  #include <gtk/gtk.h>
+  #include <pan/gui/gtk-compat.h>
 }
 
 namespace pan
diff --git a/pan/gui/profiles-dialog.cc b/pan/gui/profiles-dialog.cc
index ad73d53..139eead 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 <gtk/gtk.h>
+  #include <pan/gui/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 28a4296..1c4a9fa 100644
--- a/pan/gui/profiles-dialog.h
+++ b/pan/gui/profiles-dialog.h
@@ -20,7 +20,7 @@
 #ifndef __ProfilesDialog_h__
 #define __ProfilesDialog_h__
 
-#include <gtk/gtk.h>
+#include <pan/gui/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 9478e77..7134bfc 100644
--- a/pan/gui/progress-view.cc
+++ b/pan/gui/progress-view.cc
@@ -19,7 +19,7 @@
 
 #include <config.h>
 extern "C" {
-  #include <gtk/gtk.h>
+  #include <pan/gui/gtk-compat.h>
 }
 #include <pan/general/string-view.h>
 #include "progress-view.h"
diff --git a/pan/gui/progress-view.h b/pan/gui/progress-view.h
index de0d917..3549918 100644
--- a/pan/gui/progress-view.h
+++ b/pan/gui/progress-view.h
@@ -20,14 +20,14 @@
 #ifndef __Progress_View_h__
 #define __Progress_View_h__
 
-#include <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
 #include <pan/general/progress.h>
 
 namespace pan
 {
   /**
    * GtkProgressBar representations of general::Progress objects.
-   * 
+   *
    * These are used at the bottom of Pan's main window to show
    * the status of running Task objects.
    *
diff --git a/pan/gui/save-attach-ui.cc b/pan/gui/save-attach-ui.cc
index 44b6a40..c48d37b 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 <gtk/gtk.h>
+  #include <pan/gui/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 8a455e7..1f74909 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 <gtk/gtk.h>
+#include <pan/gui/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 0ea8dd6..f661596 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 <gtk/gtk.h>
+  #include <pan/gui/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 0ac695e..a9aba4f 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 <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
 #include "group-prefs.h"
 #include "prefs.h"
 
@@ -71,5 +71,5 @@ namespace pan
       static bool _save_text;
       static bool _save_attachments;
   };
-} 
+}
 #endif
diff --git a/pan/gui/score-add-ui.h b/pan/gui/score-add-ui.h
index 0b43d92..de0c9e2 100644
--- a/pan/gui/score-add-ui.h
+++ b/pan/gui/score-add-ui.h
@@ -1,13 +1,13 @@
 #ifndef __SCORE_ADD_UI_H__
 #define __SCORE_ADD_UI_H__
 
-#include <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
 #include <pan/data/article.h>
 #include <pan/data/data.h>
 
 namespace pan
 {
-  /** 
+  /**
    * Dialog for creating a new entry for the Scorefile.
    * @ingroup GUI
    */
diff --git a/pan/gui/score-view-ui.cc b/pan/gui/score-view-ui.cc
index d4ab4af..a82b700 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 <gtk/gtk.h>
+  #include <pan/gui/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 fccaa5b..b96cb16 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 <gtk/gtk.h>
+#include <pan/gui/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 9c90fd9..db2fc26 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 <gtk/gtk.h>
+  #include <pan/gui/gtk-compat.h>
 }
 
 #include <pan/icons/pan-pixbufs.h>
diff --git a/pan/gui/server-ui.h b/pan/gui/server-ui.h
index 971d387..07ed026 100644
--- a/pan/gui/server-ui.h
+++ b/pan/gui/server-ui.h
@@ -21,7 +21,7 @@
 #define SERVER_UI_H
 
 #include <set>
-#include <gtk/gtk.h>
+#include <pan/gui/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 89f9a50..a31a9d4 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 <gtk/gtk.h>
+  #include <pan/gui/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 109188d..09907e8 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 <gtk/gtk.h>
+#include <pan/gui/gtk-compat.h>
 #include <vector>
 #include <pan/tasks/task.h>
 #include <pan/tasks/queue.h>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]