X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-application.h;h=831f8ec549024246ef586c1577f33f5e7f91e9ed;hb=0526caefb3e35fe432e40fb9503d370907c9ef28;hp=880f0377a3c24bb476bd8661bf56eab7db970bb9;hpb=63718064505c640af952c6e180b75235a1de5f14;p=evince.git

diff --git a/shell/ev-application.h b/shell/ev-application.h
index 880f0377..831f8ec5 100644
--- a/shell/ev-application.h
+++ b/shell/ev-application.h
@@ -23,15 +23,14 @@
 #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"
-#ifndef HAVE_GTK_RECENT
-#include "egg-recent-model.h"
-#endif
+#include "ev-window.h"
 
 G_BEGIN_DECLS
 
@@ -47,55 +46,39 @@ typedef struct _EvApplicationClass EvApplicationClass;
 
 #define EV_APP					(ev_application_get_instance ())
 
-struct _EvApplication {
-	GObject base_instance;
-	
-	gchar *toolbars_file;
-	
-	EggToolbarsModel *toolbars_model;
-#ifndef HAVE_GTK_RECENT
-	EggRecentModel  *recent_model;
-#endif
-	
-	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,
-						      GHashTable      *args,
-						      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);
+gboolean	  ev_application_has_window	     (EvApplication   *application);
+const gchar *     ev_application_get_uri             (EvApplication   *application);
+GObject		 *ev_application_get_media_keys	     (EvApplication   *application);
 
-EggToolbarsModel *ev_application_get_toolbars_model  (EvApplication   *application);
-void              ev_application_save_toolbars_model (EvApplication   *application);
-#ifndef HAVE_GTK_RECENT
-EggRecentModel   *ev_application_get_recent_model    (EvApplication   *application);
-#endif
-void 		  ev_application_set_chooser_uri     (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