[pan2/new_master: 258/266] fdssdfds
- From: Heinrich MÃller <henmull src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pan2/new_master: 258/266] fdssdfds
- Date: Mon, 2 Jan 2012 14:11:33 +0000 (UTC)
commit 9f96ef6abcbda05f226b2424c3f33396dc4b00e9
Author: Heinrich MÃller <henmull src gnome org>
Date: Mon Jan 2 01:50:39 2012 +0100
fdssdfds
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 | 2 +-
pan/gui/e-charset.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 | 4 +-
pan/gui/header-pane.cc | 2 +-
pan/gui/header-pane.h | 2 +-
pan/gui/hig.cc | 4 +-
pan/gui/hig.h | 2 +-
pan/gui/log-ui.cc | 6 +-
pan/gui/log-ui.h | 2 +-
pan/gui/pan-file-entry.cc | 4 +-
pan/gui/pan-file-entry.h | 2 +-
pan/gui/pan-tree.h | 10 +-
pan/gui/pan.cc | 2 +-
pan/gui/post-ui.cc | 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-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 | 4 +-
pan/gui/task-pane.h | 2 +-
pan/gui/xface.c | 267 ++++++++++++++++++++---------------------
40 files changed, 185 insertions(+), 187 deletions(-)
---
diff --git a/pan/gui/actions.cc b/pan/gui/actions.cc
index b7e3f63..1392c7a 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 26c9c34..c6b7b46 100644
--- a/pan/gui/body-pane.cc
+++ b/pan/gui/body-pane.cc
@@ -23,8 +23,7 @@
#include <iostream>
extern "C" {
#include <glib/gi18n.h>
- #include <gtk/gtk.h>
- #include <gdk/gdk.h>
+ #include <pan/gui/gtk-compat.h>
#include <gdk/gdkkeysyms.h>
#include <gmime/gmime.h>
}
diff --git a/pan/gui/body-pane.h b/pan/gui/body-pane.h
index dd3d110..e0a514b 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 2eaaa3f..20426a6 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..9e40b2f 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 \
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/group-pane.cc b/pan/gui/group-pane.cc
index 155dafa..1faee6d 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/log.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 7f61be7..8b9edaa 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 2d8a671..d757c4f 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
@@ -51,5 +51,5 @@ namespace pan
static void response_cb (GtkDialog*, int, gpointer);
void save_from_gui ();
};
-}
+}
#endif
diff --git a/pan/gui/header-pane.cc b/pan/gui/header-pane.cc
index 27de4c3..db70267 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 <gdk/gdkkeysyms.h>
#include <iconv.h>
}
diff --git a/pan/gui/header-pane.h b/pan/gui/header-pane.h
index 702c032..d56f469 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 918adac..4810dfd 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"
using namespace pan;
@@ -129,7 +129,7 @@ HIG :: workarea_add_label (GtkWidget * table,
return l;
}
-
+
void
HIG :: workarea_add_control (GtkWidget * table,
int row,
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 05a4d72..bcbda13 100644
--- a/pan/gui/log-ui.cc
+++ b/pan/gui/log-ui.cc
@@ -22,7 +22,7 @@
#include <fstream>
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>
@@ -51,7 +51,7 @@ namespace
virtual void on_log_entry_added (const Log::Entry& e) {
GtkTreeIter iter;
gtk_list_store_prepend (myStore, &iter);
- gtk_list_store_set (myStore, &iter,
+ gtk_list_store_set (myStore, &iter,
COL_SEVERITY, (e.severity & Log::PAN_SEVERITY_ERROR),
COL_DATE, (unsigned long)e.date,
COL_MESSAGE, e.message.c_str(), -1);
@@ -122,7 +122,7 @@ namespace
foreach_const (Log::entries_t, entries, it) {
GtkTreeIter iter;
gtk_list_store_prepend (store, &iter);
- gtk_list_store_set (store, &iter,
+ gtk_list_store_set (store, &iter,
COL_SEVERITY, (it->severity & Log::PAN_SEVERITY_ERROR),
COL_DATE, (unsigned long)it->date,
COL_MESSAGE, it->message.c_str(), -1);
diff --git a/pan/gui/log-ui.h b/pan/gui/log-ui.h
index c337b25..e6bf3d5 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 ded3008..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"
@@ -81,7 +81,7 @@ pan :: file_entry_new (const char * title, int chooser_action)
g_object_set_data (G_OBJECT(hbox), "chooser-action", GINT_TO_POINTER(chooser_action));
g_object_set_data (G_OBJECT(hbox), "entry", e);
file_entry_set (hbox, g_get_home_dir());
-
+
gtk_widget_show (e);
gtk_widget_show (b);
return hbox;
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 a681fd2..c4a7fa7 100644
--- a/pan/gui/pan.cc
+++ b/pan/gui/pan.cc
@@ -22,7 +22,7 @@
#include <signal.h>
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 6cc0a58..b831583 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>
#ifdef HAVE_GTKSPELL
#include <gtkspell/gtkspell.h>
#endif
diff --git a/pan/gui/prefs-ui.cc b/pan/gui/prefs-ui.cc
index 816ec64..2cbed6a 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 21a42e4..dda9bd7 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 317a573..068e6fd 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 <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 9ed3742..856ee36 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 74c4c64..3ef0fac 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-ui.cc b/pan/gui/save-ui.cc
index 19a37e2..a5ffed0 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 a368784..5b1ff33 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/general/macros.h>
#include <pan/general/quark.h>
diff --git a/pan/gui/server-ui.h b/pan/gui/server-ui.h
index 2201976..32e6462 100644
--- a/pan/gui/server-ui.h
+++ b/pan/gui/server-ui.h
@@ -20,7 +20,7 @@
#ifndef SERVER_UI_H
#define SERVER_UI_H
-#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 15066e5..da7107f 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/debug.h>
#include <pan/general/macros.h>
@@ -225,7 +225,7 @@ TaskPane :: update_status (const task_states_t& tasks)
g_snprintf (buf, sizeof(buf), _("Pan: Tasks (%d Queued, %d Running, %d Stopped)"), queued_count, running_count, stopped_count);
else if (running_count || queued_count)
g_snprintf (buf, sizeof(buf), _("Pan: Tasks (%d Queued, %d Running)"), queued_count, running_count);
- else
+ else
g_snprintf (buf, sizeof(buf), _("Pan: Tasks"));
gtk_window_set_title (GTK_WINDOW(_root), buf);
diff --git a/pan/gui/task-pane.h b/pan/gui/task-pane.h
index 99be244..cb81d3d 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>
diff --git a/pan/gui/xface.c b/pan/gui/xface.c
index 714c635..6631295 100644
--- a/pan/gui/xface.c
+++ b/pan/gui/xface.c
@@ -1,6 +1,5 @@
#include <string.h>
#include <stdio.h>
-#include <gdk/gdk.h>
#include "xface.h"
/** begin compface.h */
@@ -13,7 +12,7 @@
* Written 11th November 1989.
*
* Permission is given to distribute these sources, as long as the
- * copyright messages are not removed, and no monies are exchanged.
+ * copyright messages are not removed, and no monies are exchanged.
*
* No responsibility is taken for any errors on inaccuracies inherent
* either to the comments or the code of this program, but if reported
@@ -162,7 +161,7 @@ static void WriteFace P((char *)) ;
* Written 11th November 1989.
*
* Permission is given to distribute these sources, as long as the
- * copyright messages are not removed, and no monies are exchanged.
+ * copyright messages are not removed, and no monies are exchanged.
*
* No responsibility is taken for any errors on inaccuracies inherent
* either to the comments or the code of this program, but if reported
@@ -452,160 +451,160 @@ static Guesses G
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
},
{
- 0, 1, 0, 1,
+ 0, 1, 0, 1,
},
{
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1,
- 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
- 0, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1,
- 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1,
- 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0,
- 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1,
- 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1,
- 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1,
- 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1,
- 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0,
- 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1,
- 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1,
- 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1,
+ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
+ 0, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1,
+ 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
+ 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1,
+ 0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1,
+ 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1,
+ 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0,
+ 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1,
+ 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1,
+ 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1,
+ 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1,
+ 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1,
+ 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0,
+ 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1,
+ 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1,
+ 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
},
{
- 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1,
- 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 1, 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1,
+ 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 1, 0,
+ 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1,
},
{
- 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
- 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
- 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
- 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1,
- 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
- 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1,
- 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
- 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1,
- 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1,
- 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1,
- 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1,
- 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1,
- 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1,
- 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
- 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
- 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 1,
+ 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+ 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+ 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+ 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+ 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+ 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+ 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+ 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+ 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+ 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1,
+ 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1,
+ 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1,
+ 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1,
+ 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+ 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+ 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 1,
},
{
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0,
- 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1,
- 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
- 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0,
- 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1,
- 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1,
- 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1,
- 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
- 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
- 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1,
- 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1,
- 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
- 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
- 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1,
- 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1,
- 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1,
- 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1,
- 0, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1,
- 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 1,
- 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1,
- 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1,
- 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 1,
- 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0,
+ 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1,
+ 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
+ 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0,
+ 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1,
+ 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1,
+ 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1,
+ 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+ 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
+ 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1,
+ 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1,
+ 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+ 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+ 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1,
+ 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1,
+ 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1,
+ 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1,
+ 0, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1,
+ 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 1,
+ 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1,
+ 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0,
+ 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1,
+ 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 1,
+ 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
},
{
- 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1,
- 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1,
+ 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1,
},
{
- 0, 0, 0, 1, 0, 1, 1, 1,
+ 0, 0, 0, 1, 0, 1, 1, 1,
},
{
- 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1,
- 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1,
+ 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1,
+ 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1,
},
{
- 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1,
- 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1,
- 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1,
+ 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1,
+ 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
},
{
- 0, 1,
+ 0, 1,
},
{
- 0,
+ 0,
},
{
- 0, 0, 0, 1,
+ 0, 0, 0, 1,
},
{
- 0, 0, 0, 1,
+ 0, 0, 0, 1,
}
}
;
@@ -1068,7 +1067,7 @@ pan_gdk_pixbuf_create_from_x_face (const char *text)
const int stride = cairo_format_stride_for_width( CAIRO_FORMAT_A1, WIDTH);
char xface [2048];
GdkPixbuf * pixbuf = NULL;
-
+
g_strlcpy (xface, text, sizeof(xface));
status = uncompface (xface);
if (status >= 0)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]