[gnome-panel] libpanel-applet-private: remove unused parameter
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-panel] libpanel-applet-private: remove unused parameter
- Date: Wed, 21 Sep 2016 15:06:02 +0000 (UTC)
commit 6f8044549fd40c07c554a50359b4464f7b796924
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Wed Sep 21 17:59:43 2016 +0300
libpanel-applet-private: remove unused parameter
.../panel-applet-container.c | 4 +---
.../panel-applet-container.h | 1 -
.../panel-applet-frame-dbus.c | 8 ++------
gnome-panel/panel-applet-frame.c | 6 ------
gnome-panel/panel-applet-frame.h | 1 -
gnome-panel/panel-test-applets.c | 1 -
6 files changed, 3 insertions(+), 18 deletions(-)
---
diff --git a/gnome-panel/libpanel-applet-private/panel-applet-container.c
b/gnome-panel/libpanel-applet-private/panel-applet-container.c
index a2586f3..d75d76d 100644
--- a/gnome-panel/libpanel-applet-private/panel-applet-container.c
+++ b/gnome-panel/libpanel-applet-private/panel-applet-container.c
@@ -392,7 +392,6 @@ on_factory_appeared (GDBusConnection *connection,
static void
panel_applet_container_get_applet (PanelAppletContainer *container,
- GdkScreen *screen,
const gchar *iid,
GVariant *props,
GCancellable *cancellable,
@@ -445,7 +444,6 @@ panel_applet_container_get_applet (PanelAppletContainer *container,
void
panel_applet_container_add (PanelAppletContainer *container,
- GdkScreen *screen,
const gchar *iid,
GCancellable *cancellable,
GAsyncReadyCallback callback,
@@ -457,7 +455,7 @@ panel_applet_container_add (PanelAppletContainer *container,
panel_applet_container_cancel_pending_operations (container);
- panel_applet_container_get_applet (container, screen, iid, properties,
+ panel_applet_container_get_applet (container, iid, properties,
cancellable, callback, user_data);
}
diff --git a/gnome-panel/libpanel-applet-private/panel-applet-container.h
b/gnome-panel/libpanel-applet-private/panel-applet-container.h
index aac8c2b..aeea0b0 100644
--- a/gnome-panel/libpanel-applet-private/panel-applet-container.h
+++ b/gnome-panel/libpanel-applet-private/panel-applet-container.h
@@ -69,7 +69,6 @@ GtkWidget *panel_applet_container_new (void);
void panel_applet_container_add (PanelAppletContainer *container,
- GdkScreen *screen,
const gchar *iid,
GCancellable *cancellable,
GAsyncReadyCallback callback,
diff --git a/gnome-panel/libpanel-applet-private/panel-applet-frame-dbus.c
b/gnome-panel/libpanel-applet-private/panel-applet-frame-dbus.c
index eda9042..b37845a 100644
--- a/gnome-panel/libpanel-applet-private/panel-applet-frame-dbus.c
+++ b/gnome-panel/libpanel-applet-private/panel-applet-frame-dbus.c
@@ -343,7 +343,6 @@ panel_applet_frame_dbus_load (const gchar *iid,
PanelAppletFrameDBus *dbus_frame;
PanelAppletFrame *frame;
GVariantBuilder builder;
- GdkScreen *screen;
gchar *settings_path;
guint orient;
@@ -357,7 +356,6 @@ panel_applet_frame_dbus_load (const gchar *iid,
frame = PANEL_APPLET_FRAME (dbus_frame);
_panel_applet_frame_set_iid (frame, iid);
- screen = panel_applet_frame_activating_get_screen (frame_act);
orient = get_panel_applet_orient (panel_applet_frame_activating_get_orientation (frame_act));
settings_path = panel_applet_frame_activating_get_settings_path (frame_act);
@@ -374,11 +372,9 @@ panel_applet_frame_dbus_load (const gchar *iid,
g_object_set_data (G_OBJECT (frame), "panel-applet-frame-activating", frame_act);
- panel_applet_container_add (dbus_frame->priv->container,
- screen, iid, NULL,
+ panel_applet_container_add (dbus_frame->priv->container, iid, NULL,
(GAsyncReadyCallback) panel_applet_frame_dbus_activated,
- frame,
- g_variant_builder_end (&builder));
+ frame, g_variant_builder_end (&builder));
g_free (settings_path);
diff --git a/gnome-panel/panel-applet-frame.c b/gnome-panel/panel-applet-frame.c
index 732e0c0..b0c5e3d 100644
--- a/gnome-panel/panel-applet-frame.c
+++ b/gnome-panel/panel-applet-frame.c
@@ -635,12 +635,6 @@ panel_applet_frame_activating_free (PanelAppletFrameActivating *frame_act)
g_slice_free (PanelAppletFrameActivating, frame_act);
}
-GdkScreen *
-panel_applet_frame_activating_get_screen (PanelAppletFrameActivating *frame_act)
-{
- return gtk_widget_get_screen (GTK_WIDGET (frame_act->panel));
-}
-
PanelOrientation
panel_applet_frame_activating_get_orientation (PanelAppletFrameActivating *frame_act)
{
diff --git a/gnome-panel/panel-applet-frame.h b/gnome-panel/panel-applet-frame.h
index a8798e3..8e646f2 100644
--- a/gnome-panel/panel-applet-frame.h
+++ b/gnome-panel/panel-applet-frame.h
@@ -91,7 +91,6 @@ void panel_applet_frame_set_panel (PanelAppletFrame *frame,
typedef struct _PanelAppletFrameActivating PanelAppletFrameActivating;
-GdkScreen *panel_applet_frame_activating_get_screen (PanelAppletFrameActivating *frame_act);
PanelOrientation panel_applet_frame_activating_get_orientation (PanelAppletFrameActivating *frame_act);
gboolean panel_applet_frame_activating_get_locked_down (PanelAppletFrameActivating *frame_act);
gchar *panel_applet_frame_activating_get_settings_path (PanelAppletFrameActivating *frame_act);
diff --git a/gnome-panel/panel-test-applets.c b/gnome-panel/panel-test-applets.c
index df93ed0..4b51487 100644
--- a/gnome-panel/panel-test-applets.c
+++ b/gnome-panel/panel-test-applets.c
@@ -138,7 +138,6 @@ load_applet_into_window (const char *title,
g_variant_builder_add (&builder, "{sv}",
"orient", g_variant_new_uint32 (orientation));
panel_applet_container_add (PANEL_APPLET_CONTAINER (container),
- gtk_widget_get_screen (applet_window),
title, NULL,
(GAsyncReadyCallback)applet_activated_cb,
applet_window,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]