[Xfce4-commits] <xfce4-panel:devel> Add set and get functions for XfcePanelImage size.

[Nick Schermer]

Updating branch refs/heads/devel
         to 90ad9c94731d234073a1158c9643b3f2ae5616fc (commit)
       from d74378df5caa30dfae2003b7b3f8eb754ce38aba (commit)

commit 90ad9c94731d234073a1158c9643b3f2ae5616fc
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Feb 18 13:59:36 2010 +0100

    Add set and get functions for XfcePanelImage size.

 docs/references/libxfce4panel-sections.txt |    2 +
 libxfce4panel/libxfce4panel.symbols        |    2 +
 libxfce4panel/xfce-panel-image.c           |   37 ++++++++++++++++++++-------
 libxfce4panel/xfce-panel-image.h           |    5 ++++
 4 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/docs/references/libxfce4panel-sections.txt b/docs/references/libxfce4panel-sections.txt
index fe8c687..348e6d4 100644
--- a/docs/references/libxfce4panel-sections.txt
+++ b/docs/references/libxfce4panel-sections.txt
@@ -68,6 +68,8 @@ xfce_panel_image_new_from_pixbuf
 xfce_panel_image_new_from_source
 xfce_panel_image_set_from_pixbuf
 xfce_panel_image_set_from_source
+xfce_panel_image_set_size
+xfce_panel_image_get_size
 xfce_panel_image_clear
 <SUBSECTION Standard>
 XfcePanelImageClass
diff --git a/libxfce4panel/libxfce4panel.symbols b/libxfce4panel/libxfce4panel.symbols
index 105035c..d22fa21 100644
--- a/libxfce4panel/libxfce4panel.symbols
+++ b/libxfce4panel/libxfce4panel.symbols
@@ -77,6 +77,8 @@ xfce_panel_image_new_from_pixbuf G_GNUC_MALLOC
 xfce_panel_image_new_from_source G_GNUC_MALLOC
 xfce_panel_image_set_from_pixbuf
 xfce_panel_image_set_from_source
+xfce_panel_image_set_size
+xfce_panel_image_get_size
 xfce_panel_image_clear
 #endif
 #endif
diff --git a/libxfce4panel/xfce-panel-image.c b/libxfce4panel/xfce-panel-image.c
index de996ae..4af747a 100644
--- a/libxfce4panel/xfce-panel-image.c
+++ b/libxfce4panel/xfce-panel-image.c
@@ -232,9 +232,6 @@ xfce_panel_image_set_property (GObject      *object,
                                const GValue *value,
                                GParamSpec   *pspec)
 {
-  XfcePanelImagePrivate *priv;
-  gint                   size;
-
   switch (prop_id)
     {
     case PROP_SOURCE:
@@ -248,13 +245,8 @@ xfce_panel_image_set_property (GObject      *object,
       break;
 
     case PROP_SIZE:
-      priv = XFCE_PANEL_IMAGE (object)->priv;
-      size = g_value_get_int (value);
-      if (G_LIKELY (priv->size != size))
-        {
-          priv->size = size;
-          gtk_widget_queue_resize (GTK_WIDGET (object));
-        }
+      xfce_panel_image_set_size (XFCE_PANEL_IMAGE (object),
+                                 g_value_get_int (value));
       break;
 
     default:
@@ -548,6 +540,31 @@ xfce_panel_image_set_from_source (XfcePanelImage *image,
 
 
 
+void       
+xfce_panel_image_set_size (XfcePanelImage *image,
+                           gint            size)
+{
+  
+  g_return_if_fail (XFCE_IS_PANEL_IMAGE (image));
+  
+  if (G_LIKELY (image->priv->size != size))
+    {
+      image->priv->size = size;
+      gtk_widget_queue_resize (GTK_WIDGET (image));
+    }
+}
+
+
+
+gint       
+xfce_panel_image_get_size (XfcePanelImage *image)
+{
+  g_return_val_if_fail (XFCE_IS_PANEL_IMAGE (image), -1);
+  return image->priv->size;
+}
+
+
+
 void
 xfce_panel_image_clear (XfcePanelImage *image)
 {
diff --git a/libxfce4panel/xfce-panel-image.h b/libxfce4panel/xfce-panel-image.h
index d03785e..3c53ca4 100644
--- a/libxfce4panel/xfce-panel-image.h
+++ b/libxfce4panel/xfce-panel-image.h
@@ -71,6 +71,11 @@ void       xfce_panel_image_set_from_pixbuf (XfcePanelImage *image,
 void       xfce_panel_image_set_from_source (XfcePanelImage *image,
                                              const gchar    *source);
 
+void       xfce_panel_image_set_size        (XfcePanelImage *image,
+                                             gint            size);
+
+gint       xfce_panel_image_get_size        (XfcePanelImage *image);
+
 void       xfce_panel_image_clear           (XfcePanelImage *image);
 
 G_END_DECLS