2011-10-31 [pawel] 3.7.10cvs66

[claws.git] / src / mimeview.h

diff --git a/src/mimeview.h b/src/mimeview.h
index 9b9d91f593f9f619ec651d9d95b961ad40ffe4df..7a974148acb78071a688b477ed73e0d4609f7429 100644 (file)
--- a/src/mimeview.h
+++ b/src/mimeview.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2011 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,9 @@ typedef struct _MimeViewer            MimeViewer;
 #include <glib.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
+#if !GTK_CHECK_VERSION(3, 0, 0)
 #include "gtk/gtksctree.h"
+#endif
 #ifdef USE_PTHREAD
 #include <pthread.h>
 #endif
@@ -48,6 +50,10 @@ typedef struct _SigCheckData SigCheckData;
 struct _SigCheckData
 {
        pthread_t th;
+       pthread_t cancel_th;
+       gboolean th_init;
+       gboolean cancel_th_init;
+
        MimeInfo *siginfo;
        gboolean free_after_use;
        gboolean destroy_mimeview;
@@ -73,7 +79,9 @@ struct _MimeView
 
        GtkWidget *popupmenu;
 
+#if !GTK_CHECK_VERSION(3, 0, 0)
        GtkCMCTreeNode *opened;
+#endif
 
        TextView *textview;
        MimeViewer *mimeviewer;
@@ -97,10 +105,12 @@ struct _MimeView
 
        NoticeView *siginfoview;
        MimeInfo *siginfo;
+       MimeInfo *spec_part;
+       GtkUIManager *ui_manager;
+       GtkActionGroup *action_group;
 #ifdef USE_PTHREAD
        SigCheckData *check_data;
 #endif
-       MimeInfo *spec_part;
 };
 
 struct _MimeViewerFactory
@@ -151,7 +161,7 @@ void mimeview_clear         (MimeView       *mimeview);
 
 MimeInfo *mimeview_get_selected_part   (MimeView       *mimeview);
 
-void mimeview_pass_key_press_event     (MimeView       *mimeview,
+gboolean mimeview_pass_key_press_event (MimeView       *mimeview,
                                         GdkEventKey    *event);
 
 void mimeview_register_viewer_factory  (MimeViewerFactory *factory);