[gnome-panel/wip/gnome-3.10+: 26/75] remove deprecated functions from libpanel-applet
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-panel/wip/gnome-3.10+: 26/75] remove deprecated functions from libpanel-applet
- Date: Tue, 7 Oct 2014 22:28:11 +0000 (UTC)
commit c8ee9cf8ab75791e9862d3fa42e54c752aea2dc5
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Tue Jul 8 22:18:43 2014 +0300
remove deprecated functions from libpanel-applet
applets/wncklet/showdesktop.c | 2 -
applets/wncklet/window-list.c | 38 ++++-----
applets/wncklet/window-menu.c | 1 -
gnome-panel/applet.c | 1 -
.../panel-applet-container.c | 1 -
.../panel-applet-frame-dbus.c | 15 ---
gnome-panel/panel-applet-frame.c | 13 ---
gnome-panel/panel-applet-frame.h | 7 --
gnome-panel/panel.c | 34 -------
gnome-panel/panel.h | 1 -
libpanel-applet/panel-applet.c | 93 --------------------
libpanel-applet/panel-applet.h | 5 -
libpanel-applet/test-dbus-applet.c | 25 ++++--
13 files changed, 33 insertions(+), 203 deletions(-)
---
diff --git a/applets/wncklet/showdesktop.c b/applets/wncklet/showdesktop.c
index 66d30fc..49f38aa 100644
--- a/applets/wncklet/showdesktop.c
+++ b/applets/wncklet/showdesktop.c
@@ -413,8 +413,6 @@ show_desktop_applet_fill (PanelApplet *applet)
break;
}
- sdd->size = panel_applet_get_size (PANEL_APPLET (sdd->applet));
-
g_signal_connect (G_OBJECT (sdd->applet), "realize",
G_CALLBACK (show_desktop_applet_realized), sdd);
diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c
index 99bb9b1..9496298 100644
--- a/applets/wncklet/window-list.c
+++ b/applets/wncklet/window-list.c
@@ -114,7 +114,7 @@ applet_change_orient (PanelApplet *applet,
tasklist->orientation = new_orient;
- wnck_tasklist_set_orientation (tasklist->tasklist, new_orient);
+ wnck_tasklist_set_orientation (WNCK_TASKLIST (tasklist->tasklist), new_orient);
tasklist_update (tasklist);
}
@@ -130,19 +130,6 @@ applet_change_background (PanelApplet *applet,
}
static void
-applet_change_pixel_size (PanelApplet *applet,
- gint size,
- TasklistData *tasklist)
-{
- if (tasklist->size == size)
- return;
-
- tasklist->size = size;
-
- tasklist_update (tasklist);
-}
-
-static void
destroy_tasklist(GtkWidget * widget, TasklistData *tasklist)
{
g_object_unref (tasklist->settings);
@@ -289,14 +276,28 @@ applet_size_allocate (GtkWidget *widget,
GtkAllocation *allocation,
TasklistData *tasklist)
{
- int len;
+ gint len, size;
const int *size_hints;
+ PanelAppletOrient orient = panel_applet_get_orient (PANEL_APPLET (tasklist->applet));
size_hints = wnck_tasklist_get_size_hint_list (WNCK_TASKLIST (tasklist->tasklist), &len);
g_assert (len % 2 == 0);
panel_applet_set_size_hints (PANEL_APPLET (tasklist->applet),
size_hints, len, 0);
+
+ if (orient == PANEL_APPLET_ORIENT_UP || orient == PANEL_APPLET_ORIENT_DOWN) {
+ size = allocation->height;
+ } else {
+ size = allocation->width;
+ }
+
+ if (tasklist->size == size)
+ return;
+
+ tasklist->size = size;
+
+ tasklist_update (tasklist);
}
static GdkPixbuf*
@@ -371,7 +372,6 @@ window_list_applet_fill (PanelApplet *applet)
tasklist->grouping = g_settings_get_enum (tasklist->settings, "group-windows");
tasklist->move_unminimized_windows = g_settings_get_boolean (tasklist->settings,
"move-unminimized-windows");
- tasklist->size = panel_applet_get_size (applet);
switch (panel_applet_get_orient (applet)) {
case PANEL_APPLET_ORIENT_LEFT:
case PANEL_APPLET_ORIENT_RIGHT:
@@ -386,7 +386,7 @@ window_list_applet_fill (PanelApplet *applet)
tasklist->tasklist = wnck_tasklist_new ();
- wnck_tasklist_set_orientation (tasklist->tasklist, tasklist->orientation);
+ wnck_tasklist_set_orientation (WNCK_TASKLIST (tasklist->tasklist), tasklist->orientation);
wnck_tasklist_set_icon_loader (WNCK_TASKLIST (tasklist->tasklist),
icon_loader_func, tasklist, NULL);
@@ -410,10 +410,6 @@ window_list_applet_fill (PanelApplet *applet)
G_CALLBACK (applet_change_orient),
tasklist);
g_signal_connect (G_OBJECT (tasklist->applet),
- "change_size",
- G_CALLBACK (applet_change_pixel_size),
- tasklist);
- g_signal_connect (G_OBJECT (tasklist->applet),
"change_background",
G_CALLBACK (applet_change_background),
tasklist);
diff --git a/applets/wncklet/window-menu.c b/applets/wncklet/window-menu.c
index 4f1dd61..b9dc587 100644
--- a/applets/wncklet/window-menu.c
+++ b/applets/wncklet/window-menu.c
@@ -202,7 +202,6 @@ window_menu_applet_fill (PanelApplet *applet)
gtk_widget_set_tooltip_text (window_menu->applet, _("Window Selector"));
panel_applet_set_flags (applet, PANEL_APPLET_EXPAND_MINOR);
- window_menu->size = panel_applet_get_size (applet);
window_menu->orient = panel_applet_get_orient (applet);
g_signal_connect (window_menu->applet, "destroy",
diff --git a/gnome-panel/applet.c b/gnome-panel/applet.c
index dc11a2e..323804c 100644
--- a/gnome-panel/applet.c
+++ b/gnome-panel/applet.c
@@ -978,7 +978,6 @@ panel_applet_register (GtkWidget *applet,
gtk_widget_show (applet);
orientation_change (info, panel);
- size_change (info, panel);
back_change (info, panel);
if (type != PANEL_OBJECT_APPLET)
diff --git a/gnome-panel/libpanel-applet-private/panel-applet-container.c
b/gnome-panel/libpanel-applet-private/panel-applet-container.c
index 8f09811..8705a04 100644
--- a/gnome-panel/libpanel-applet-private/panel-applet-container.c
+++ b/gnome-panel/libpanel-applet-private/panel-applet-container.c
@@ -53,7 +53,6 @@ typedef struct {
static const AppletPropertyInfo applet_properties [] = {
{ "settings-path", "SettingsPath" },
{ "orient", "Orient" },
- { "size", "Size" },
{ "size-hints", "SizeHints" },
{ "background", "Background" },
{ "flags", "Flags" },
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 049fa58..f31a218 100644
--- a/gnome-panel/libpanel-applet-private/panel-applet-frame-dbus.c
+++ b/gnome-panel/libpanel-applet-private/panel-applet-frame-dbus.c
@@ -221,17 +221,6 @@ panel_applet_frame_dbus_change_orientation (PanelAppletFrame *frame,
}
static void
-panel_applet_frame_dbus_change_size (PanelAppletFrame *frame,
- guint size)
-{
- PanelAppletFrameDBus *dbus_frame = PANEL_APPLET_FRAME_DBUS (frame);
-
- panel_applet_container_child_set (dbus_frame->priv->container,
- "size", g_variant_new_uint32 (size),
- NULL, NULL, NULL);
-}
-
-static void
container_child_background_set (GObject *source_object,
GAsyncResult *res,
gpointer user_data)
@@ -376,7 +365,6 @@ panel_applet_frame_dbus_class_init (PanelAppletFrameDBusClass *class)
frame_class->popup_menu = panel_applet_frame_dbus_popup_menu;
frame_class->popup_edit_menu = panel_applet_frame_dbus_popup_edit_menu;
frame_class->change_orientation = panel_applet_frame_dbus_change_orientation;
- frame_class->change_size = panel_applet_frame_dbus_change_size;
frame_class->change_background = panel_applet_frame_dbus_change_background;
g_type_class_add_private (class, sizeof (PanelAppletFrameDBusPrivate));
@@ -436,9 +424,6 @@ panel_applet_frame_dbus_load (const gchar *iid,
"orient",
g_variant_new_uint32 (orient));
g_variant_builder_add (&builder, "{sv}",
- "size",
- g_variant_new_uint32 (panel_applet_frame_activating_get_size (frame_act)));
- g_variant_builder_add (&builder, "{sv}",
"locked-down",
g_variant_new_boolean (panel_applet_frame_activating_get_locked_down
(frame_act)));
if (background) {
diff --git a/gnome-panel/panel-applet-frame.c b/gnome-panel/panel-applet-frame.c
index c6c9ea3..bd6436b 100644
--- a/gnome-panel/panel-applet-frame.c
+++ b/gnome-panel/panel-applet-frame.c
@@ -522,13 +522,6 @@ panel_applet_frame_change_orientation (PanelAppletFrame *frame,
}
void
-panel_applet_frame_change_size (PanelAppletFrame *frame,
- guint size)
-{
- PANEL_APPLET_FRAME_GET_CLASS (frame)->change_size (frame, size);
-}
-
-void
panel_applet_frame_change_background (PanelAppletFrame *frame,
PanelBackgroundType type)
{
@@ -865,12 +858,6 @@ panel_applet_frame_activating_get_orientation (PanelAppletFrameActivating *frame
return panel_widget_get_applet_orientation (frame_act->panel);
}
-guint32
-panel_applet_frame_activating_get_size (PanelAppletFrameActivating *frame_act)
-{
- return frame_act->panel->sz;
-}
-
gboolean
panel_applet_frame_activating_get_locked_down (PanelAppletFrameActivating *frame_act)
{
diff --git a/gnome-panel/panel-applet-frame.h b/gnome-panel/panel-applet-frame.h
index 8090895..2d234cf 100644
--- a/gnome-panel/panel-applet-frame.h
+++ b/gnome-panel/panel-applet-frame.h
@@ -62,9 +62,6 @@ struct _PanelAppletFrameClass {
void (*change_orientation) (PanelAppletFrame *frame,
PanelOrientation orientation);
- void (*change_size) (PanelAppletFrame *frame,
- guint size);
-
void (*change_background) (PanelAppletFrame *frame,
PanelBackgroundType type);
};
@@ -89,9 +86,6 @@ void panel_applet_frame_load (PanelWidget *panel_widget,
void panel_applet_frame_change_orientation (PanelAppletFrame *frame,
PanelOrientation orientation);
-void panel_applet_frame_change_size (PanelAppletFrame *frame,
- guint size);
-
void panel_applet_frame_change_background (PanelAppletFrame *frame,
PanelBackgroundType type);
@@ -105,7 +99,6 @@ typedef struct _PanelAppletFrameActivating PanelAppletFrameActivating;
GdkScreen *panel_applet_frame_activating_get_screen (PanelAppletFrameActivating *frame_act);
PanelOrientation panel_applet_frame_activating_get_orientation (PanelAppletFrameActivating *frame_act);
-guint32 panel_applet_frame_activating_get_size (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.c b/gnome-panel/panel.c
index 3e39dd7..f04abdb 100644
--- a/gnome-panel/panel.c
+++ b/gnome-panel/panel.c
@@ -108,35 +108,6 @@ panel_orient_change (GtkWidget *widget, gpointer data)
widget);
}
-/*we call this recursively*/
-static void size_change_foreach(GtkWidget *w, gpointer data);
-
-void
-size_change (AppletInfo *info,
- PanelWidget *panel)
-{
- if (info->type == PANEL_OBJECT_APPLET)
- panel_applet_frame_change_size (
- PANEL_APPLET_FRAME (info->widget), panel->sz);
-}
-
-static void
-size_change_foreach(GtkWidget *w, gpointer data)
-{
- AppletInfo *info = g_object_get_data (G_OBJECT (w), "applet_info");
- PanelWidget *panel = data;
-
- size_change(info,panel);
-}
-
-
-static void
-panel_size_change (GtkWidget *widget, gpointer data)
-{
- gtk_container_foreach(GTK_CONTAINER(widget), size_change_foreach,
- widget);
-}
-
void
back_change (AppletInfo *info,
PanelWidget *panel)
@@ -190,7 +161,6 @@ panel_applet_added(GtkWidget *widget, GtkWidget *applet, gpointer data)
info = g_object_get_data (G_OBJECT (applet), "applet_info");
orientation_change(info,PANEL_WIDGET(widget));
- size_change(info,PANEL_WIDGET(widget));
back_change(info,PANEL_WIDGET(widget));
}
@@ -1291,10 +1261,6 @@ panel_widget_setup(PanelWidget *panel)
"back_change",
G_CALLBACK (panel_back_change),
NULL);
- g_signal_connect (G_OBJECT (panel),
- "size_change",
- G_CALLBACK (panel_size_change),
- NULL);
}
PanelData *
diff --git a/gnome-panel/panel.h b/gnome-panel/panel.h
index 799f54e..2ac80c1 100644
--- a/gnome-panel/panel.h
+++ b/gnome-panel/panel.h
@@ -17,7 +17,6 @@ struct _PanelData {
};
void orientation_change(AppletInfo *info, PanelWidget *panel);
-void size_change(AppletInfo *info, PanelWidget *panel);
void back_change(AppletInfo *info, PanelWidget *panel);
PanelData *panel_setup (PanelToplevel *toplevel);
diff --git a/libpanel-applet/panel-applet.c b/libpanel-applet/panel-applet.c
index 7dbf956..c634134 100644
--- a/libpanel-applet/panel-applet.c
+++ b/libpanel-applet/panel-applet.c
@@ -92,7 +92,6 @@ struct _PanelAppletPrivate {
PanelAppletFlags flags;
PanelAppletOrient orient;
- guint size;
char *background;
GtkWidget *background_widget;
@@ -109,7 +108,6 @@ struct _PanelAppletPrivate {
enum {
CHANGE_ORIENT,
- CHANGE_SIZE,
CHANGE_BACKGROUND,
MOVE_FOCUS_OUT_OF_APPLET,
LAST_SIGNAL
@@ -124,7 +122,6 @@ enum {
PROP_CONNECTION,
PROP_SETTINGS_PATH,
PROP_ORIENT,
- PROP_SIZE,
PROP_BACKGROUND,
PROP_FLAGS,
PROP_SIZE_HINTS,
@@ -390,44 +387,6 @@ panel_applet_set_size_hints (PanelApplet *applet,
}
/**
- * panel_applet_get_size:
- * @applet: a #PanelApplet.
- *
- * Gets the size of the panel @applet is on. For a horizontal panel, the
- * size if the height of the panel; for a vertical panel, the size is the width
- * of the panel.
- *
- * Returns: the size of the panel @applet is on.
- *
- * Deprecated: 3.0: Use the allocation of @applet instead.
- **/
-guint
-panel_applet_get_size (PanelApplet *applet)
-{
- g_return_val_if_fail (PANEL_IS_APPLET (applet), 0);
-
- return applet->priv->size;
-}
-
-/* Applets cannot set their size, so API is not public. */
-static void
-panel_applet_set_size (PanelApplet *applet,
- guint size)
-{
- g_return_if_fail (PANEL_IS_APPLET (applet));
-
- if (applet->priv->size == size)
- return;
-
- applet->priv->size = size;
- g_signal_emit (G_OBJECT (applet),
- panel_applet_signals [CHANGE_SIZE],
- 0, size);
-
- g_object_notify (G_OBJECT (applet), "size");
-}
-
-/**
* panel_applet_get_orient:
* @applet: a #PanelApplet.
*
@@ -1689,9 +1648,6 @@ panel_applet_get_property (GObject *object,
case PROP_ORIENT:
g_value_set_uint (value, applet->priv->orient);
break;
- case PROP_SIZE:
- g_value_set_uint (value, applet->priv->size);
- break;
case PROP_BACKGROUND:
g_value_set_string (value, applet->priv->background);
break;
@@ -1750,9 +1706,6 @@ panel_applet_set_property (GObject *object,
case PROP_ORIENT:
panel_applet_set_orient (applet, g_value_get_uint (value));
break;
- case PROP_SIZE:
- panel_applet_set_size (applet, g_value_get_uint (value));
- break;
case PROP_BACKGROUND:
panel_applet_set_background_string (applet, g_value_get_string (value));
break;
@@ -1842,7 +1795,6 @@ panel_applet_init (PanelApplet *applet)
applet->priv->flags = PANEL_APPLET_FLAGS_NONE;
applet->priv->orient = PANEL_APPLET_ORIENT_UP;
- applet->priv->size = 24;
applet->priv->panel_action_group = g_simple_action_group_new ();
g_action_map_add_action_entries (G_ACTION_MAP (applet->priv->panel_action_group),
@@ -1984,25 +1936,6 @@ panel_applet_class_init (PanelAppletClass *klass)
PANEL_APPLET_ORIENT_UP,
G_PARAM_READWRITE));
/**
- * PanelApplet:size:
- *
- * The size of the panel the applet is on. For a horizontal panel, the
- * size if the height of the panel; for a vertical panel, the size is
- * the width of the panel.
- *
- * This property gets set when the applet gets embedded, and can change
- * when the panel size changes.
- *
- * Deprecated: 3.0: Use the allocation of @applet instead.
- **/
- g_object_class_install_property (gobject_class,
- PROP_SIZE,
- g_param_spec_uint ("size",
- "Size",
- "Panel Applet Size",
- 0, G_MAXUINT, 0,
- G_PARAM_READWRITE));
- /**
* PanelApplet:background: (skip)
*
* Implementation detail.
@@ -2073,27 +2006,6 @@ panel_applet_class_init (PanelAppletClass *klass)
G_TYPE_UINT);
/**
- * PanelApplet::change-size:
- * @applet: the #PanelApplet which emitted the signal.
- * @size: the new size of the panel @applet is on.
- *
- * Emitted when the size of the panel @applet is on has changed.
- *
- * Deprecated: 3.0: Use the #GtkWidget::size-allocate signal instead.
- **/
- panel_applet_signals [CHANGE_SIZE] =
- g_signal_new ("change_size",
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (PanelAppletClass, change_size),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__INT,
- G_TYPE_NONE,
- 1,
- G_TYPE_INT);
-
- /**
* PanelApplet::change-background:
* @applet: the #PanelApplet which emitted the signal.
* @pattern: the new background pattern for @applet, or %NULL if there is none.
@@ -2187,8 +2099,6 @@ get_property_cb (GDBusConnection *connection,
applet->priv->settings_path : "");
} else if (g_strcmp0 (property_name, "Orient") == 0) {
retval = g_variant_new_uint32 (applet->priv->orient);
- } else if (g_strcmp0 (property_name, "Size") == 0) {
- retval = g_variant_new_uint32 (applet->priv->size);
} else if (g_strcmp0 (property_name, "Background") == 0) {
retval = g_variant_new_string (applet->priv->background ?
applet->priv->background : "");
@@ -2227,8 +2137,6 @@ set_property_cb (GDBusConnection *connection,
panel_applet_set_settings_path (applet, g_variant_get_string (value, NULL));
} else if (g_strcmp0 (property_name, "Orient") == 0) {
panel_applet_set_orient (applet, g_variant_get_uint32 (value));
- } else if (g_strcmp0 (property_name, "Size") == 0) {
- panel_applet_set_size (applet, g_variant_get_uint32 (value));
} else if (g_strcmp0 (property_name, "Background") == 0) {
panel_applet_set_background_string (applet, g_variant_get_string (value, NULL));
} else if (g_strcmp0 (property_name, "Flags") == 0) {
@@ -2259,7 +2167,6 @@ static const gchar introspection_xml[] =
"</method>"
"<property name='SettingsPath' type='s' access='readwrite'/>"
"<property name='Orient' type='u' access='readwrite' />"
- "<property name='Size' type='u' access='readwrite'/>"
"<property name='Background' type='s' access='readwrite'/>"
"<property name='Flags' type='u' access='readwrite'/>"
"<property name='SizeHints' type='ai' access='readwrite'/>"
diff --git a/libpanel-applet/panel-applet.h b/libpanel-applet/panel-applet.h
index 411e9a9..dfec892 100644
--- a/libpanel-applet/panel-applet.h
+++ b/libpanel-applet/panel-applet.h
@@ -120,10 +120,6 @@ struct _PanelAppletClass {
void (*change_orient) (PanelApplet *applet,
PanelAppletOrient orient);
-
- void (*change_size) (PanelApplet *applet,
- guint size);
-
void (*change_background) (PanelApplet *applet,
cairo_pattern_t *pattern);
void (*move_focus_out_of_applet) (PanelApplet *frame,
@@ -133,7 +129,6 @@ struct _PanelAppletClass {
GType panel_applet_get_type (void) G_GNUC_CONST;
PanelAppletOrient panel_applet_get_orient (PanelApplet *applet);
-guint panel_applet_get_size (PanelApplet *applet);
cairo_pattern_t *panel_applet_get_background (PanelApplet *applet);
void panel_applet_set_background_widget (PanelApplet *applet,
diff --git a/libpanel-applet/test-dbus-applet.c b/libpanel-applet/test-dbus-applet.c
index 7d19d00..3b70001 100644
--- a/libpanel-applet/test-dbus-applet.c
+++ b/libpanel-applet/test-dbus-applet.c
@@ -76,10 +76,20 @@ test_applet_handle_orient_change (TestApplet *applet,
}
static void
-test_applet_handle_size_change (TestApplet *applet,
- gint size,
- gpointer dummy)
+test_applet_handle_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation,
+ TestApplet *applet)
{
+ PanelApplet *panel_applet = PANEL_APPLET (widget);
+ PanelAppletOrient orient = panel_applet_get_orient (panel_applet);
+ guint size;
+
+ if (orient == PANEL_APPLET_ORIENT_UP || orient == PANEL_APPLET_ORIENT_DOWN) {
+ size = allocation->height;
+ } else {
+ size = allocation->width;
+ }
+
switch (size) {
case 12:
gtk_label_set_markup (
@@ -136,9 +146,6 @@ test_applet_fill (TestApplet *applet)
gtk_widget_show_all (GTK_WIDGET (applet));
- test_applet_handle_size_change (applet,
- panel_applet_get_size (PANEL_APPLET (applet)),
- NULL);
test_applet_handle_orient_change (applet,
panel_applet_get_orient (PANEL_APPLET (applet)),
NULL);
@@ -168,9 +175,9 @@ test_applet_fill (TestApplet *applet)
NULL);
g_signal_connect (G_OBJECT (applet),
- "change_size",
- G_CALLBACK (test_applet_handle_size_change),
- NULL);
+ "size-allocate",
+ G_CALLBACK (test_applet_handle_size_allocate),
+ applet);
g_signal_connect (G_OBJECT (applet),
"change_background",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
