[dualscreen] fix crash on ctrl+w and fix control window closing

[evince.git] / shell / ev-sidebar.h

diff --git a/shell/ev-sidebar.h b/shell/ev-sidebar.h
index ec028ffb462e5bbc293c7f58e059d3e1becfa902..1c8fed2267e171a3df80c483ed844b34261fdac6 100644 (file)
--- a/shell/ev-sidebar.h
+++ b/shell/ev-sidebar.h
@@ -18,14 +18,15 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifndef __EV_SIDEBAR_H__
 #define __EV_SIDEBAR_H__
 
-#include <gtk/gtkvbox.h>
-#include "ev-document.h"
+#include <gtk/gtk.h>
+
+#include "ev-document-model.h"
 
 G_BEGIN_DECLS
 
@@ -33,12 +34,12 @@ typedef struct _EvSidebar EvSidebar;
 typedef struct _EvSidebarClass EvSidebarClass;
 typedef struct _EvSidebarPrivate EvSidebarPrivate;
 
-#define EV_TYPE_SIDEBAR                        (ev_sidebar_get_type())
-#define EV_SIDEBAR(object)             (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_SIDEBAR, EvSidebar))
-#define EV_SIDEBAR_CLASS(klass)                (G_TYPE_CHACK_CLASS_CAST((klass), EV_TYPE_SIDEBAR, EvSidebarClass))
-#define EV_IS_SIDEBAR(object)          (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_SIDEBAR))
-#define EV_IS_SIDEBAR_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE((klass), EV_TYPE_SIDEBAR))
-#define EV_SIDEBAR_GET_CLASS(object)   (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_SIDEBAR, EvSidebarClass))
+#define EV_TYPE_SIDEBAR                     (ev_sidebar_get_type())
+#define EV_SIDEBAR(object)          (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_SIDEBAR, EvSidebar))
+#define EV_SIDEBAR_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST((klass), EV_TYPE_SIDEBAR, EvSidebarClass))
+#define EV_IS_SIDEBAR(object)       (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_SIDEBAR))
+#define EV_IS_SIDEBAR_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE((klass), EV_TYPE_SIDEBAR))
+#define EV_SIDEBAR_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_SIDEBAR, EvSidebarClass))
 
 struct _EvSidebar {
        GtkVBox base_instance;
@@ -50,15 +51,14 @@ struct _EvSidebarClass {
        GtkVBoxClass base_class;
 };
 
-GType      ev_sidebar_get_type     (void);
-GtkWidget *ev_sidebar_new          (void);
-void       ev_sidebar_add_page     (EvSidebar   *ev_sidebar,
-                                   const gchar *page_id,
-                                   const gchar *title,
-                                   GtkWidget   *main_widget);
-void       ev_sidebar_set_document (EvSidebar   *ev_sidebar,
-                                   EvDocument  *document);
-void       ev_sidebar_clear        (EvSidebar   *ev_sidebar);
+GType      ev_sidebar_get_type  (void) G_GNUC_CONST;
+GtkWidget *ev_sidebar_new       (void);
+void       ev_sidebar_add_page  (EvSidebar       *ev_sidebar,
+                                GtkWidget       *main_widget);
+void       ev_sidebar_set_page  (EvSidebar       *ev_sidebar,
+                                GtkWidget       *main_widget);
+void       ev_sidebar_set_model (EvSidebar       *sidebar,
+                                EvDocumentModel *model);
 
 G_END_DECLS