diff options
| author | Felix Riemann <[email protected]> | 2011-01-03 13:41:44 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2018-07-11 08:39:23 +0200 |
| commit | 9b79e09d57c87be17359a25277bbf3831395e2bf (patch) | |
| tree | cc1b13e7591f5d4ca33ac7aaab082cf7bc9ea759 /plugins/fullscreen | |
| parent | 026b114ae5839cdb61524639a91e111e5f15e369 (diff) | |
| download | eom-9b79e09d57c87be17359a25277bbf3831395e2bf.tar.bz2 eom-9b79e09d57c87be17359a25277bbf3831395e2bf.tar.xz | |
Update plugins to use EomWindowActivatable interface
https://bugzilla.gnome.org/show_bug.cgi?id=626091
origin commit:
https://gitlab.gnome.org/GNOME/eog/commit/3d3d2bb
Diffstat (limited to 'plugins/fullscreen')
| -rw-r--r-- | plugins/fullscreen/eom-fullscreen-plugin.c | 29 | ||||
| -rw-r--r-- | plugins/fullscreen/eom-fullscreen-plugin.h | 4 |
2 files changed, 18 insertions, 15 deletions
diff --git a/plugins/fullscreen/eom-fullscreen-plugin.c b/plugins/fullscreen/eom-fullscreen-plugin.c index 98accb4..653a725 100644 --- a/plugins/fullscreen/eom-fullscreen-plugin.c +++ b/plugins/fullscreen/eom-fullscreen-plugin.c @@ -10,19 +10,20 @@ #include <eom-debug.h> #include <eom-window.h> +#include <eom-window-activatable.h> -static void peas_activatable_iface_init (PeasActivatableInterface *iface); +static void eom_window_activatable_iface_init (EomWindowActivatableInterface *iface); G_DEFINE_DYNAMIC_TYPE_EXTENDED (EomFullscreenPlugin, eom_fullscreen_plugin, PEAS_TYPE_EXTENSION_BASE, 0, - G_IMPLEMENT_INTERFACE_DYNAMIC (PEAS_TYPE_ACTIVATABLE, - peas_activatable_iface_init)) + G_IMPLEMENT_INTERFACE_DYNAMIC (EOM_TYPE_WINDOW_ACTIVATABLE, + eom_window_activatable_iface_init)) enum { PROP_0, - PROP_OBJECT + PROP_WINDOW }; static gboolean @@ -59,8 +60,8 @@ eom_fullscreen_plugin_set_property (GObject *object, switch (prop_id) { - case PROP_OBJECT: - plugin->window = GTK_WIDGET (g_value_dup_object (value)); + case PROP_WINDOW: + plugin->window = EOM_WINDOW (g_value_dup_object (value)); break; default: @@ -79,7 +80,7 @@ eom_fullscreen_plugin_get_property (GObject *object, switch (prop_id) { - case PROP_OBJECT: + case PROP_WINDOW: g_value_set_object (value, plugin->window); break; @@ -111,10 +112,10 @@ eom_fullscreen_plugin_dispose (GObject *object) } static void -eom_fullscreen_plugin_activate (PeasActivatable *activatable) +eom_fullscreen_plugin_activate (EomWindowActivatable *activatable) { EomFullscreenPlugin *plugin = EOM_FULLSCREEN_PLUGIN (activatable); - GtkWidget *view = eom_window_get_view (EOM_WINDOW (plugin->window)); + GtkWidget *view = eom_window_get_view (plugin->window); eom_debug (DEBUG_PLUGINS); @@ -125,10 +126,10 @@ eom_fullscreen_plugin_activate (PeasActivatable *activatable) } static void -eom_fullscreen_plugin_deactivate (PeasActivatable *activatable) +eom_fullscreen_plugin_deactivate (EomWindowActivatable *activatable) { EomFullscreenPlugin *plugin = EOM_FULLSCREEN_PLUGIN (activatable); - GtkWidget *view = eom_window_get_view (EOM_WINDOW (plugin->window)); + GtkWidget *view = eom_window_get_view (plugin->window); g_signal_handler_disconnect (view, plugin->signal_id); } @@ -142,7 +143,7 @@ eom_fullscreen_plugin_class_init (EomFullscreenPluginClass *klass) object_class->set_property = eom_fullscreen_plugin_set_property; object_class->get_property = eom_fullscreen_plugin_get_property; - g_object_class_override_property (object_class, PROP_OBJECT, "object"); + g_object_class_override_property (object_class, PROP_WINDOW, "window"); } static void @@ -152,7 +153,7 @@ eom_fullscreen_plugin_class_finalize (EomFullscreenPluginClass *klass) } static void -peas_activatable_iface_init (PeasActivatableInterface *iface) +eom_window_activatable_iface_init (EomWindowActivatableInterface *iface) { iface->activate = eom_fullscreen_plugin_activate; iface->deactivate = eom_fullscreen_plugin_deactivate; @@ -163,6 +164,6 @@ peas_register_types (PeasObjectModule *module) { eom_fullscreen_plugin_register_type (G_TYPE_MODULE (module)); peas_object_module_register_extension_type (module, - PEAS_TYPE_ACTIVATABLE, + EOM_TYPE_WINDOW_ACTIVATABLE, EOM_TYPE_FULLSCREEN_PLUGIN); } diff --git a/plugins/fullscreen/eom-fullscreen-plugin.h b/plugins/fullscreen/eom-fullscreen-plugin.h index 0e7d9da..6be5171 100644 --- a/plugins/fullscreen/eom-fullscreen-plugin.h +++ b/plugins/fullscreen/eom-fullscreen-plugin.h @@ -7,6 +7,8 @@ #include <libpeas/peas-extension-base.h> #include <libpeas/peas-object-module.h> +#include <eom-window.h> + G_BEGIN_DECLS /* @@ -36,7 +38,7 @@ typedef struct _EomFullscreenPlugin EomFullscreenPlugin; struct _EomFullscreenPlugin { PeasExtensionBase parent_instance; - GtkWidget *window; + EomWindow *window; gulong signal_id; }; |