[Xfce4-commits] <xfce4-indicator-plugin:master> Cleanup

Andrzej noreply at xfce.org
Sat Aug 31 04:12:01 CEST 2013


Updating branch refs/heads/master
         to 4eccf5405f8c7101c071110c54a108cdab9b3a48 (commit)
       from 5a3fddd9491426337cb2e52bd4c537228ec0b0bb (commit)

commit 4eccf5405f8c7101c071110c54a108cdab9b3a48
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Sat Aug 31 00:51:59 2013 +0100

    Cleanup

 panel-plugin/Makefile.am            |   50 +++++++++++++++++------------------
 panel-plugin/indicator-box.c        |   14 +---------
 panel-plugin/indicator-button-box.c |    7 ++---
 panel-plugin/indicator-button.c     |    1 -
 panel-plugin/indicator-config.c     |    2 +-
 5 files changed, 29 insertions(+), 45 deletions(-)

diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index f2d4f23..3acf147 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -1,8 +1,8 @@
 
-INCLUDES =										\
-	-I$(top_srcdir)								\
-	-DG_LOG_DOMAIN=\"libindicator-plugin\"	\
-	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"		\
+INCLUDES = \
+	-I$(top_srcdir) \
+	-DG_LOG_DOMAIN=\"libindicator-plugin\" \
+	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
 	$(PLATFORM_CPPFLAGS)
 
 #
@@ -19,28 +19,28 @@ libindicator_built_sources = \
 
 libindicator_plugin_la_SOURCES = \
 	$(libindicator_built_sources) \
-	indicator-config.c									\
-	indicator-config.h									\
-	indicator-button-box.c									\
-	indicator-button-box.h									\
-	indicator-button.c									\
-	indicator-button.h									\
-	indicator-box.c									\
-	indicator-box.h									\
+	indicator-config.c \
+	indicator-config.h \
+	indicator-button-box.c \
+	indicator-button-box.h \
+	indicator-button.c \
+	indicator-button.h \
+	indicator-box.c \
+	indicator-box.h \
 	indicator-dialog.c \
 	indicator-dialog.h \
-	indicator.c									\
-	indicator.h									
+	indicator.c \
+	indicator.h
 
 libindicator_plugin_la_CFLAGS = \
 	$(GTK_CFLAGS) \
-	$(LIBXFCE4UTIL_CFLAGS)						\
+	$(LIBXFCE4UTIL_CFLAGS) \
 	$(LIBXFCE4UI_CFLAGS) \
-	$(LIBXFCE4PANEL_CFLAGS)						\
-	$(XFCONF_CFLAGS)					\
-	$(INDICATOR_CFLAGS)						\
-	$(PLATFORM_CFLAGS)					\
-	-DDATADIR=\""$(datadir)"\" 				\
+	$(LIBXFCE4PANEL_CFLAGS) \
+	$(XFCONF_CFLAGS) \
+	$(INDICATOR_CFLAGS) \
+	$(PLATFORM_CFLAGS) \
+	-DDATADIR=\""$(datadir)"\" \
 	-DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
 	-DINDICATOR_DIR=\""$(INDICATORDIR)"\"
 
@@ -53,16 +53,16 @@ libindicator_plugin_la_LDFLAGS = \
 
 libindicator_plugin_la_LIBADD = \
 	$(GTK_LIBS) \
-	$(LIBXFCE4UTIL_LIBS)						\
+	$(LIBXFCE4UTIL_LIBS) \
 	$(LIBXFCE4UI_LIBS) \
-	$(LIBXFCE4PANEL_LIBS)						\
-	$(XFCONF_LIBS)						\
+	$(LIBXFCE4PANEL_LIBS) \
+	$(XFCONF_LIBS) \
 	$(INDICATOR_LIBS)
 
 #
 # Desktop file
 #
-desktopdir =									\
+desktopdir = \
 	$(datadir)/xfce4/panel/plugins
 
 desktop_in_files = \
@@ -72,7 +72,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 
 @INTLTOOL_DESKTOP_RULE@
 
-EXTRA_DIST =									\
+EXTRA_DIST = \
 	indicator-dialog.glade \
 	$(desktop_in_files)
 
diff --git a/panel-plugin/indicator-box.c b/panel-plugin/indicator-box.c
index bba6dd9..4f0b98f 100644
--- a/panel-plugin/indicator-box.c
+++ b/panel-plugin/indicator-box.c
@@ -305,18 +305,6 @@ xfce_indicator_box_child_type (GtkContainer *container)
 
 
 
-static gint
-xfce_indicator_box_get_row_size (XfceIndicatorBox *box)
-{
-  return MIN (indicator_config_get_panel_size (box->config) /
-              indicator_config_get_nrows (box->config),
-              indicator_config_get_row_size_max (box->config));
-}
-
-
-
-
-
 static void
 xfce_indicator_box_get_preferred_length (GtkWidget *widget,
                                          gint      *minimum_length,
@@ -469,7 +457,7 @@ xfce_indicator_box_size_allocate (GtkWidget     *widget,
   XfceIndicatorButton *button;
   GtkAllocation        child_alloc;
   GtkRequisition       child_req;
-  gint                 panel_size, size, full_size, spacing;
+  gint                 panel_size, size, full_size;
   gint                 x, y;
   gint                 x0, y0;
   GList               *known_indicators, *li, *li_int, *li_tmp;
diff --git a/panel-plugin/indicator-button-box.c b/panel-plugin/indicator-button-box.c
index 2812e2c..75285c1 100644
--- a/panel-plugin/indicator-button-box.c
+++ b/panel-plugin/indicator-button-box.c
@@ -276,7 +276,7 @@ indicator_button_box_set_image (IndicatorButtonBox  *box,
   g_return_if_fail (XFCE_IS_INDICATOR_BUTTON_BOX (box));
   g_return_if_fail (GTK_IS_IMAGE (image));
 
-  g_debug ("indicator-button-box set image, image=%x\n", (uint) image);
+  /* g_debug ("indicator-button-box set image, image=%x", (uint) image); */
 
   if (box->icon != NULL)
     {
@@ -344,7 +344,7 @@ indicator_button_box_disconnect_signals (IndicatorButtonBox *box)
 gboolean
 indicator_button_box_is_small (IndicatorButtonBox *box)
 {
-  g_return_if_fail (XFCE_IS_INDICATOR_BUTTON_BOX (box));
+  g_return_val_if_fail (XFCE_IS_INDICATOR_BUTTON_BOX (box), FALSE);
 
   if (box->cached)
     return box->is_small;
@@ -394,7 +394,6 @@ indicator_button_box_get_preferred_width (GtkWidget *widget,
                                           gint      *natural_width)
 {
   IndicatorButtonBox  *box = XFCE_INDICATOR_BUTTON_BOX (widget);
-  IndicatorConfig     *config = box->config;
   gint                 min_size, nat_size;
 
   if (indicator_button_box_is_small (box)) // check & cache
@@ -448,7 +447,6 @@ indicator_button_box_get_preferred_height (GtkWidget *widget,
                                            gint      *natural_height)
 {
   IndicatorButtonBox  *box = XFCE_INDICATOR_BUTTON_BOX (widget);
-  IndicatorConfig     *config = box->config;
   gint                 min_size, nat_size;
 
   if (indicator_button_box_is_small (box)) // check & cache
@@ -501,7 +499,6 @@ indicator_button_box_size_allocate (GtkWidget     *widget,
                                     GtkAllocation *allocation)
 {
   IndicatorButtonBox  *box = XFCE_INDICATOR_BUTTON_BOX (widget);
-  IndicatorConfig     *config = box->config;
   gint                 label_width, label_height;
   gint                 x, y, width, height;
   GtkAllocation        child_allocation;
diff --git a/panel-plugin/indicator-button.c b/panel-plugin/indicator-button.c
index 7c4bffd..88161a4 100644
--- a/panel-plugin/indicator-button.c
+++ b/panel-plugin/indicator-button.c
@@ -44,7 +44,6 @@
 //#endif
 
 static void                 xfce_indicator_button_finalize        (GObject                *object);
-static gint                 xfce_indicator_button_get_icon_size   (XfceIndicatorButton    *button);
 static gboolean             xfce_indicator_button_button_press    (GtkWidget              *widget,
                                                                    GdkEventButton         *event);
 static gboolean             xfce_indicator_button_scroll          (GtkWidget              *widget,
diff --git a/panel-plugin/indicator-config.c b/panel-plugin/indicator-config.c
index 2c89a8c..78a42f2 100644
--- a/panel-plugin/indicator-config.c
+++ b/panel-plugin/indicator-config.c
@@ -701,7 +701,7 @@ indicator_config_swap_known_indicators (IndicatorConfig *config,
   /* make sure that the list contains name1 followed by name2 */
   if (li == NULL || li->next == NULL || g_strcmp0 (li->next->data, name2) != 0)
     {
-      g_debug("Couldn't swap indicators: %s and %s\n", name1, name2);
+      g_debug("Couldn't swap indicators: %s and %s", name1, name2);
       return;
     }
 


More information about the Xfce4-commits mailing list