[dualscreen] in short "Disziplin ist Macht."

diff --git a/libview/ev-view-presentation.c b/libview/ev-view-presentation.c
index fa8ceff958e41eec03993d3b8967a9fd98463c67..c3e40bf5787c557535f623470f65c010a0a70a6d 100644 (file)
--- a/libview/ev-view-presentation.c
+++ b/libview/ev-view-presentation.c
@@ -1334,7 +1334,7 @@ ev_view_presentation_realize (GtkWidget *widget)
                                           window);
 
        g_idle_add ((GSourceFunc)init_presentation, widget);
-       }
+}
 
 static void
 ev_view_presentation_change_page (EvViewPresentation *pview,

diff --git a/shell/ev-dualscreen.c b/shell/ev-dualscreen.c
index f5dc1cb9fac4975df003f22ee65fb8b60fc41440..208fe349fc1084ccae9d0c39b3b7b56a96083547 100644 (file)
--- a/shell/ev-dualscreen.c
+++ b/shell/ev-dualscreen.c
@@ -36,12 +36,14 @@
 #include "ev-utils.h"
 #include "ev-sidebar.h"
 #include "ev-sidebar-thumbnails.h"
+#include "ev-presentation-timer.h"
 
 struct _EvDSCWindowPrivate {
        GtkWidget       *main_box;
        GtkWidget       *menubar;
        GtkWidget       *sidebar;
        GtkWidget       *notesview;
+       GtkWidget       *timer;
        EvDocumentModel *model;
        EvDocumentModel *notes_model;
        EvDocument      *presentation_document;
@@ -313,8 +315,12 @@ ev_dscwindow_init (EvDSCWindow *ev_dscwindow)
                G_CALLBACK (ev_dscwindow_sidebar_visibility), ev_dscwindow->priv->sidebar);
 
        gtk_container_add (GTK_CONTAINER (expander), toolbar);
-       gtk_box_pack_end (GTK_BOX (vbox), expander, FALSE, TRUE, 0);
 
+       GtkWidget *hbox = gtk_hbox_new (FALSE,0);
+       gtk_box_pack_start (GTK_BOX (hbox), expander, FALSE, TRUE, 0);
+       ev_dscwindow->priv->timer = ev_presentation_timer_new ();
+       gtk_box_pack_end (GTK_BOX (hbox), ev_dscwindow->priv->timer, TRUE, TRUE, 0);
+       gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
        gtk_widget_show_all(vbox);
        gtk_container_add (GTK_CONTAINER (ev_dscwindow), vbox);
 }

diff --git a/shell/ev-dualscreen.h b/shell/ev-dualscreen.h
index 9cd2355d21a168810a938bd3d7a3c8799aaeb6e2..6317430feab906d32042bfb581e32eb13fdd36bb 100644 (file)
--- a/shell/ev-dualscreen.h
+++ b/shell/ev-dualscreen.h
@@ -41,13 +41,13 @@ typedef struct _EvDSCWindowPrivate EvDSCWindowPrivate;
 #define EV_IS_DSCWINDOW_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE((klass), EV_TYPE_DSCWINDOW))
 #define EV_DSCWINDOW_GET_CLASS(object)  (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_DSCWINDOW, EvDSCWindowClass))
 
-struct _EvDSCWindow {
-       GtkWindow               base_instance;
-       EvDSCWindowPrivate      *priv;
+struct _EvDSCWindowClass {
+       GtkWindowClass          base_class;
 };
 
-struct _EvDSCWindowClass {
-       GtkWindowClass base_class;
+struct _EvDSCWindow {
+       GtkWindow                base_instance;
+       EvDSCWindowPrivate      *priv;
 };
 
 GType          ev_dscwindow_get_type   (void);