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

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

diff --git a/shell/ev-application.h b/shell/ev-application.h
index 0c562c0b62bd75eadc642f0158cae1f331d81fa1..c00b554c34b7831f0132b5f605861e4edfbab97d 100644 (file)
--- a/shell/ev-application.h
+++ b/shell/ev-application.h
@@ -17,19 +17,20 @@
  *
  * 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_APPLICATION_H
 #define EV_APPLICATION_H
 
-#include <glib/gerror.h>
-#include <glib-object.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
-#include "ev-window.h"
+#include <glib.h>
+#include <gtk/gtk.h>
 
-#include "egg-toolbars-model.h"
-#include "egg-recent-model.h"
+#include "ev-window.h"
 
 G_BEGIN_DECLS
 
@@ -45,50 +46,41 @@ typedef struct _EvApplicationClass EvApplicationClass;
 
 #define EV_APP                                 (ev_application_get_instance ())
 
-struct _EvApplication {
-       GObject base_instance;
-       
-       gchar *toolbars_file;
-       
-       EggToolbarsModel *toolbars_model;
-       EggRecentModel  *recent_model;
-       
-       gchar *last_chooser_uri;
-};
-
-struct _EvApplicationClass {
-       GObjectClass base_class;
-};
-
-GType            ev_application_get_type            (void);
+GType            ev_application_get_type            (void) G_GNUC_CONST;
 EvApplication    *ev_application_get_instance        (void);
-gboolean          ev_application_register_service    (EvApplication   *application);
-void             ev_application_shutdown            (EvApplication   *application);
 
-
-gboolean          ev_application_open_window         (EvApplication   *application,
-                                                     guint32          timestamp,
-                                                     GError         **error);
-gboolean          ev_application_open_uri            (EvApplication   *application,
-                                                     const char      *uri,
-                                                     const char      *page_label,
-                                                     guint            timestamp,
-                                                     GError         **error);
+void              ev_application_shutdown            (EvApplication   *application);
+gboolean          ev_application_load_session        (EvApplication   *application);
+void              ev_application_open_window         (EvApplication   *application,
+                                                     GdkScreen       *screen,
+                                                     guint32          timestamp);
 void              ev_application_open_uri_at_dest    (EvApplication   *application,
                                                      const char      *uri,
+                                                     GdkScreen       *screen,
                                                      EvLinkDest      *dest,
+                                                     EvWindowRunMode  mode,
+                                                     const gchar     *search_string,
                                                      guint32          timestamp);
 void             ev_application_open_uri_list       (EvApplication   *application,
                                                      GSList          *uri_list,
+                                                     GdkScreen       *screen,
                                                      guint32          timestamp);
-GList           *ev_application_get_windows         (EvApplication   *application);
-
-EggToolbarsModel *ev_application_get_toolbars_model  (EvApplication   *application);
-void              ev_application_save_toolbars_model (EvApplication   *application);
-EggRecentModel   *ev_application_get_recent_model    (EvApplication   *application);
-void             ev_application_set_chooser_uri     (EvApplication   *application, 
+GDBusConnection  *ev_application_get_dbus_connection (EvApplication   *application);
+gboolean         ev_application_has_window          (EvApplication   *application);
+guint             ev_application_get_n_windows       (EvApplication   *application);
+const gchar *     ev_application_get_uri             (EvApplication   *application);
+GObject                 *ev_application_get_media_keys      (EvApplication   *application);
+
+void             ev_application_set_filechooser_uri (EvApplication   *application,
+                                                     GtkFileChooserAction action,
                                                      const gchar     *uri);
-const gchar     *ev_application_get_chooser_uri     (EvApplication   *application);
+const gchar     *ev_application_get_filechooser_uri (EvApplication   *application,
+                                                     GtkFileChooserAction action);
+void             ev_application_screensaver_enable  (EvApplication   *application);
+void             ev_application_screensaver_disable (EvApplication   *application);
+const gchar      *ev_application_get_dot_dir         (EvApplication   *application,
+                                                      gboolean         create);
+const gchar      *ev_application_get_data_dir        (EvApplication   *application);
 
 G_END_DECLS