diff options
| author | Claudio Saavedra <[email protected]> | 2011-06-09 22:33:30 +0300 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2018-07-08 12:19:44 +0200 |
| commit | 20d704b7b4f2560ee27cc9be25359107ceb4a14b (patch) | |
| tree | 202e9a1335722c7f288019972b4e4afe5ae0f98a /src/eom-application.h | |
| parent | 63a6313edf251919487047f47ad1f08228e7ba8d (diff) | |
| download | eom-20d704b7b4f2560ee27cc9be25359107ceb4a14b.tar.bz2 eom-20d704b7b4f2560ee27cc9be25359107ceb4a14b.tar.xz | |
Port EomApplication to GtkApplication
This removes the direct dependency on dbus and makes use of the
GApplication/GtkApplication facilities for uniqueness and activation.
Bump the glib requirement to 2.29.4, since we need
G_APPLICATION_NON_UNIQUE.
https://bugzilla.gnome.org/show_bug.cgi?id=622876
origin commit:
https://gitlab.gnome.org/GNOME/eog/commit/3d39587
Enable TotemScreensaver unconditionally
It uses GDBus instead of libdbus now. It can be enabled even if
libdbus is not available as GDBus/GIO is always present.
origin commit:
https://gitlab.gnome.org/GNOME/eog/commit/4c32882
Diffstat (limited to 'src/eom-application.h')
| -rw-r--r-- | src/eom-application.h | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/src/eom-application.h b/src/eom-application.h index dcf4cb8..7741d50 100644 --- a/src/eom-application.h +++ b/src/eom-application.h @@ -29,9 +29,7 @@ #include "eom-plugin-engine.h" #include "egg-toolbars-model.h" -#ifdef HAVE_DBUS #include "totem-scrsaver.h" -#endif #include <glib.h> #include <glib-object.h> @@ -52,32 +50,25 @@ typedef struct _EomApplicationPrivate EomApplicationPrivate; #define EOM_APP (eom_application_get_instance ()) struct _EomApplication { - GObject base_instance; + GtkApplication base_instance; EggToolbarsModel *toolbars_model; gchar *toolbars_file; EomPluginEngine *plugin_engine; -#ifdef HAVE_DBUS TotemScrsaver *scr_saver; -#endif + EomStartupFlags flags; }; struct _EomApplicationClass { - GObjectClass parent_class; + GtkApplicationClass parent_class; }; GType eom_application_get_type (void) G_GNUC_CONST; EomApplication *eom_application_get_instance (void); -#ifdef HAVE_DBUS -gboolean eom_application_register_service (EomApplication *application); -#endif - -void eom_application_shutdown (EomApplication *application); - gboolean eom_application_open_window (EomApplication *application, guint timestamp, EomStartupFlags flags, @@ -95,15 +86,11 @@ gboolean eom_application_open_file_list (EomApplication *applicati EomStartupFlags flags, GError **error); -#ifdef HAVE_DBUS gboolean eom_application_open_uris (EomApplication *application, gchar **uris, guint timestamp, EomStartupFlags flags, GError **error); -#endif - -GList *eom_application_get_windows (EomApplication *application); EggToolbarsModel *eom_application_get_toolbars_model (EomApplication *application); @@ -111,11 +98,9 @@ void eom_application_save_toolbars_model (EomApplication *applicati void eom_application_reset_toolbars_model (EomApplication *app); -#ifdef HAVE_DBUS void eom_application_screensaver_enable (EomApplication *application); void eom_application_screensaver_disable (EomApplication *application); -#endif G_END_DECLS |