Skip to content

Commit 9b79e09

Browse files
fxriraveit65
fxri
authored and
raveit65
committed
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
1 parent 026b114 commit 9b79e09

File tree

6 files changed

+55
-46
lines changed

6 files changed

+55
-46
lines changed

‎plugins/fullscreen/eom-fullscreen-plugin.c‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,20 @@
1010

1111
#include <eom-debug.h>
1212
#include <eom-window.h>
13+
#include <eom-window-activatable.h>
1314

14-
static void peas_activatable_iface_init (PeasActivatableInterface *iface);
15+
static void eom_window_activatable_iface_init (EomWindowActivatableInterface *iface);
1516

1617
G_DEFINE_DYNAMIC_TYPE_EXTENDED (EomFullscreenPlugin,
1718
eom_fullscreen_plugin,
1819
PEAS_TYPE_EXTENSION_BASE,
1920
0,
20-
G_IMPLEMENT_INTERFACE_DYNAMIC (PEAS_TYPE_ACTIVATABLE,
21-
peas_activatable_iface_init))
21+
G_IMPLEMENT_INTERFACE_DYNAMIC (EOM_TYPE_WINDOW_ACTIVATABLE,
22+
eom_window_activatable_iface_init))
2223

2324
enum {
2425
PROP_0,
25-
PROP_OBJECT
26+
PROP_WINDOW
2627
};
2728

2829
static gboolean
@@ -59,8 +60,8 @@ eom_fullscreen_plugin_set_property (GObject *object,
5960

6061
switch (prop_id)
6162
{
62-
case PROP_OBJECT:
63-
plugin->window = GTK_WIDGET (g_value_dup_object (value));
63+
case PROP_WINDOW:
64+
plugin->window = EOM_WINDOW (g_value_dup_object (value));
6465
break;
6566

6667
default:
@@ -79,7 +80,7 @@ eom_fullscreen_plugin_get_property (GObject *object,
7980

8081
switch (prop_id)
8182
{
82-
case PROP_OBJECT:
83+
case PROP_WINDOW:
8384
g_value_set_object (value, plugin->window);
8485
break;
8586

@@ -111,10 +112,10 @@ eom_fullscreen_plugin_dispose (GObject *object)
111112
}
112113

113114
static void
114-
eom_fullscreen_plugin_activate (PeasActivatable *activatable)
115+
eom_fullscreen_plugin_activate (EomWindowActivatable *activatable)
115116
{
116117
EomFullscreenPlugin *plugin = EOM_FULLSCREEN_PLUGIN (activatable);
117-
GtkWidget *view = eom_window_get_view (EOM_WINDOW (plugin->window));
118+
GtkWidget *view = eom_window_get_view (plugin->window);
118119

119120
eom_debug (DEBUG_PLUGINS);
120121

@@ -125,10 +126,10 @@ eom_fullscreen_plugin_activate (PeasActivatable *activatable)
125126
}
126127

127128
static void
128-
eom_fullscreen_plugin_deactivate (PeasActivatable *activatable)
129+
eom_fullscreen_plugin_deactivate (EomWindowActivatable *activatable)
129130
{
130131
EomFullscreenPlugin *plugin = EOM_FULLSCREEN_PLUGIN (activatable);
131-
GtkWidget *view = eom_window_get_view (EOM_WINDOW (plugin->window));
132+
GtkWidget *view = eom_window_get_view (plugin->window);
132133

133134
g_signal_handler_disconnect (view, plugin->signal_id);
134135
}
@@ -142,7 +143,7 @@ eom_fullscreen_plugin_class_init (EomFullscreenPluginClass *klass)
142143
object_class->set_property = eom_fullscreen_plugin_set_property;
143144
object_class->get_property = eom_fullscreen_plugin_get_property;
144145

145-
g_object_class_override_property (object_class, PROP_OBJECT, "object");
146+
g_object_class_override_property (object_class, PROP_WINDOW, "window");
146147
}
147148

148149
static void
@@ -152,7 +153,7 @@ eom_fullscreen_plugin_class_finalize (EomFullscreenPluginClass *klass)
152153
}
153154

154155
static void
155-
peas_activatable_iface_init (PeasActivatableInterface *iface)
156+
eom_window_activatable_iface_init (EomWindowActivatableInterface *iface)
156157
{
157158
iface->activate = eom_fullscreen_plugin_activate;
158159
iface->deactivate = eom_fullscreen_plugin_deactivate;
@@ -163,6 +164,6 @@ peas_register_types (PeasObjectModule *module)
163164
{
164165
eom_fullscreen_plugin_register_type (G_TYPE_MODULE (module));
165166
peas_object_module_register_extension_type (module,
166-
PEAS_TYPE_ACTIVATABLE,
167+
EOM_TYPE_WINDOW_ACTIVATABLE,
167168
EOM_TYPE_FULLSCREEN_PLUGIN);
168169
}

‎plugins/fullscreen/eom-fullscreen-plugin.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
#include <libpeas/peas-extension-base.h>
88
#include <libpeas/peas-object-module.h>
99

10+
#include <eom-window.h>
11+
1012
G_BEGIN_DECLS
1113

1214
/*
@@ -36,7 +38,7 @@ typedef struct _EomFullscreenPlugin EomFullscreenPlugin;
3638
struct _EomFullscreenPlugin {
3739
PeasExtensionBase parent_instance;
3840

39-
GtkWidget *window;
41+
EomWindow *window;
4042
gulong signal_id;
4143
};
4244

‎plugins/reload/eom-reload-plugin.c‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,20 @@
1010

1111
#include <eom-debug.h>
1212
#include <eom-window.h>
13+
#include <eom-window-activatable.h>
1314

14-
static void peas_activatable_iface_init (PeasActivatableInterface *iface);
15+
static void eom_window_activatable_iface_init (EomWindowActivatableInterface *iface);
1516

1617
G_DEFINE_DYNAMIC_TYPE_EXTENDED (EomReloadPlugin,
1718
eom_reload_plugin,
1819
PEAS_TYPE_EXTENSION_BASE,
1920
0,
20-
G_IMPLEMENT_INTERFACE_DYNAMIC (PEAS_TYPE_ACTIVATABLE,
21-
peas_activatable_iface_init))
21+
G_IMPLEMENT_INTERFACE_DYNAMIC (EOM_TYPE_WINDOW_ACTIVATABLE,
22+
eom_window_activatable_iface_init))
2223

2324
enum {
2425
PROP_0,
25-
PROP_OBJECT
26+
PROP_WINDOW
2627
};
2728

2829
static void
@@ -54,8 +55,8 @@ eom_reload_plugin_set_property (GObject *object,
5455

5556
switch (prop_id)
5657
{
57-
case PROP_OBJECT:
58-
plugin->window = GTK_WIDGET (g_value_dup_object (value));
58+
case PROP_WINDOW:
59+
plugin->window = EOM_WINDOW (g_value_dup_object (value));
5960
break;
6061

6162
default:
@@ -74,7 +75,7 @@ eom_reload_plugin_get_property (GObject *object,
7475

7576
switch (prop_id)
7677
{
77-
case PROP_OBJECT:
78+
case PROP_WINDOW:
7879
g_value_set_object (value, plugin->window);
7980
break;
8081

@@ -106,14 +107,14 @@ eom_reload_plugin_dispose (GObject *object)
106107
}
107108

108109
static void
109-
eom_reload_plugin_activate (PeasActivatable *activatable)
110+
eom_reload_plugin_activate (EomWindowActivatable *activatable)
110111
{
111112
EomReloadPlugin *plugin = EOM_RELOAD_PLUGIN (activatable);
112113
GtkUIManager *manager;
113114

114115
eom_debug (DEBUG_PLUGINS);
115116

116-
manager = eom_window_get_ui_manager (EOM_WINDOW (plugin->window));
117+
manager = eom_window_get_ui_manager (plugin->window);
117118

118119
plugin->ui_action_group = gtk_action_group_new ("EomReloadPluginActions");
119120

@@ -129,14 +130,14 @@ eom_reload_plugin_activate (PeasActivatable *activatable)
129130
}
130131

131132
static void
132-
eom_reload_plugin_deactivate (PeasActivatable *activatable)
133+
eom_reload_plugin_deactivate (EomWindowActivatable *activatable)
133134
{
134135
EomReloadPlugin *plugin = EOM_RELOAD_PLUGIN (activatable);
135136
GtkUIManager *manager;
136137

137138
eom_debug (DEBUG_PLUGINS);
138139

139-
manager = eom_window_get_ui_manager (EOM_WINDOW (plugin->window));
140+
manager = eom_window_get_ui_manager (plugin->window);
140141

141142
gtk_ui_manager_remove_ui (manager, plugin->ui_id);
142143

@@ -154,7 +155,7 @@ eom_reload_plugin_class_init (EomReloadPluginClass *klass)
154155
object_class->set_property = eom_reload_plugin_set_property;
155156
object_class->get_property = eom_reload_plugin_get_property;
156157

157-
g_object_class_override_property (object_class, PROP_OBJECT, "object");
158+
g_object_class_override_property (object_class, PROP_WINDOW, "window");
158159
}
159160

160161
static void
@@ -164,7 +165,7 @@ eom_reload_plugin_class_finalize (EomReloadPluginClass *klass)
164165
}
165166

166167
static void
167-
peas_activatable_iface_init (PeasActivatableInterface *iface)
168+
eom_window_activatable_iface_init (EomWindowActivatableInterface *iface)
168169
{
169170
iface->activate = eom_reload_plugin_activate;
170171
iface->deactivate = eom_reload_plugin_deactivate;
@@ -175,6 +176,6 @@ peas_register_types (PeasObjectModule *module)
175176
{
176177
eom_reload_plugin_register_type (G_TYPE_MODULE (module));
177178
peas_object_module_register_extension_type (module,
178-
PEAS_TYPE_ACTIVATABLE,
179+
EOM_TYPE_WINDOW_ACTIVATABLE,
179180
EOM_TYPE_RELOAD_PLUGIN);
180181
}

‎plugins/reload/eom-reload-plugin.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
#include <libpeas/peas-extension-base.h>
88
#include <libpeas/peas-object-module.h>
99

10+
#include <eom-window.h>
11+
1012
G_BEGIN_DECLS
1113

1214
/*
@@ -36,7 +38,7 @@ typedef struct _EomReloadPlugin EomReloadPlugin;
3638
struct _EomReloadPlugin {
3739
PeasExtensionBase parent_instance;
3840

39-
GtkWidget *window;
41+
EomWindow *window;
4042
GtkActionGroup *ui_action_group;
4143
guint ui_id;
4244
};

‎plugins/statusbar-date/eom-statusbar-date-plugin.c‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,22 @@
3232
#include <eom-debug.h>
3333
#include <eom-image.h>
3434
#include <eom-thumb-view.h>
35-
#include <eom-window.h>
3635
#include <eom-exif-util.h>
36+
#include <eom-window.h>
37+
#include <eom-window-activatable.h>
3738

38-
static void peas_activatable_iface_init (PeasActivatableInterface *iface);
39+
static void eom_window_activatable_iface_init (EomWindowActivatableInterface *iface);
3940

4041
G_DEFINE_DYNAMIC_TYPE_EXTENDED (EomStatusbarDatePlugin,
4142
eom_statusbar_date_plugin,
4243
PEAS_TYPE_EXTENSION_BASE,
4344
0,
44-
G_IMPLEMENT_INTERFACE_DYNAMIC (PEAS_TYPE_ACTIVATABLE,
45-
peas_activatable_iface_init))
45+
G_IMPLEMENT_INTERFACE_DYNAMIC (EOM_TYPE_WINDOW_ACTIVATABLE,
46+
eom_window_activatable_iface_init))
4647

4748
enum {
4849
PROP_0,
49-
PROP_OBJECT
50+
PROP_WINDOW
5051
};
5152

5253
static void
@@ -112,8 +113,8 @@ eom_statusbar_date_plugin_set_property (GObject *object,
112113

113114
switch (prop_id)
114115
{
115-
case PROP_OBJECT:
116-
plugin->window = GTK_WIDGET (g_value_dup_object (value));
116+
case PROP_WINDOW:
117+
plugin->window = EOM_WINDOW (g_value_dup_object (value));
117118
break;
118119

119120
default:
@@ -132,7 +133,7 @@ eom_statusbar_date_plugin_get_property (GObject *object,
132133

133134
switch (prop_id)
134135
{
135-
case PROP_OBJECT:
136+
case PROP_WINDOW:
136137
g_value_set_object (value, plugin->window);
137138
break;
138139

@@ -164,10 +165,10 @@ eom_statusbar_date_plugin_dispose (GObject *object)
164165
}
165166

166167
static void
167-
eom_statusbar_date_plugin_activate (PeasActivatable *activatable)
168+
eom_statusbar_date_plugin_activate (EomWindowActivatable *activatable)
168169
{
169170
EomStatusbarDatePlugin *plugin = EOM_STATUSBAR_DATE_PLUGIN (activatable);
170-
EomWindow *window = EOM_WINDOW (plugin->window);
171+
EomWindow *window = plugin->window;
171172
GtkWidget *statusbar = eom_window_get_statusbar (window);
172173
GtkWidget *thumbview = eom_window_get_thumb_view (window);
173174

@@ -187,10 +188,10 @@ eom_statusbar_date_plugin_activate (PeasActivatable *activatable)
187188
}
188189

189190
static void
190-
eom_statusbar_date_plugin_deactivate (PeasActivatable *activatable)
191+
eom_statusbar_date_plugin_deactivate (EomWindowActivatable *activatable)
191192
{
192193
EomStatusbarDatePlugin *plugin = EOM_STATUSBAR_DATE_PLUGIN (activatable);
193-
EomWindow *window = EOM_WINDOW (plugin->window);
194+
EomWindow *window = plugin->window;
194195
GtkWidget *statusbar = eom_window_get_statusbar (window);
195196
GtkWidget *view = eom_window_get_thumb_view (window);
196197

@@ -208,7 +209,7 @@ eom_statusbar_date_plugin_class_init (EomStatusbarDatePluginClass *klass)
208209
object_class->set_property = eom_statusbar_date_plugin_set_property;
209210
object_class->get_property = eom_statusbar_date_plugin_get_property;
210211

211-
g_object_class_override_property (object_class, PROP_OBJECT, "object");
212+
g_object_class_override_property (object_class, PROP_WINDOW, "window");
212213
}
213214

214215
static void
@@ -218,7 +219,7 @@ eom_statusbar_date_plugin_class_finalize (EomStatusbarDatePluginClass *klass)
218219
}
219220

220221
static void
221-
peas_activatable_iface_init (PeasActivatableInterface *iface)
222+
eom_window_activatable_iface_init (EomWindowActivatableInterface *iface)
222223
{
223224
iface->activate = eom_statusbar_date_plugin_activate;
224225
iface->deactivate = eom_statusbar_date_plugin_deactivate;
@@ -229,6 +230,6 @@ peas_register_types (PeasObjectModule *module)
229230
{
230231
eom_statusbar_date_plugin_register_type (G_TYPE_MODULE (module));
231232
peas_object_module_register_extension_type (module,
232-
PEAS_TYPE_ACTIVATABLE,
233+
EOM_TYPE_WINDOW_ACTIVATABLE,
233234
EOM_TYPE_STATUSBAR_DATE_PLUGIN);
234235
}

‎plugins/statusbar-date/eom-statusbar-date-plugin.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
#include <libpeas/peas-extension-base.h>
2929
#include <libpeas/peas-object-module.h>
3030

31+
#include <eom-window.h>
32+
3133
G_BEGIN_DECLS
3234

3335
/*
@@ -57,7 +59,7 @@ typedef struct _EomStatusbarDatePlugin EomStatusbarDatePlugin;
5759
struct _EomStatusbarDatePlugin {
5860
PeasExtensionBase parent_instance;
5961

60-
GtkWidget *window;
62+
EomWindow *window;
6163
GtkWidget *statusbar_date;
6264
gulong signal_id;
6365
};

0 commit comments

Comments
 (0)