summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Erias Morandeira <femorandeira@igalia.com>2013-05-24 18:44:31 +0200
committerFelipe Erias Morandeira <femorandeira@igalia.com>2013-06-03 12:19:03 +0200
commit12a5a83f4e7f2e5c20b13e48f7b70c519b37f592 (patch)
tree693670137d83e4e548251c542667967a645a2e4f
parentdcd9db26a5bcb2f5c3fc3bc152a5212f4c1bb36e (diff)
Fixed warnings
[endlessm/eos-sdk#30]
-rw-r--r--endless/eosactionbutton.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/endless/eosactionbutton.c b/endless/eosactionbutton.c
index d8279b4..94aa11d 100644
--- a/endless/eosactionbutton.c
+++ b/endless/eosactionbutton.c
@@ -222,7 +222,7 @@ eos_action_button_finalize (GObject *object)
/* ******* PROPERTIES ******* */
-void
+static void
eos_action_button_load_icon (EosActionButton *button)
{
EosActionButtonPrivate *priv;
@@ -421,7 +421,7 @@ eos_action_button_set_property (GObject *object,
/* ******* EXTENDED METHODS ******* */
-void
+static void
eos_action_button_get_real_size (GtkWidget *widget,
GtkOrientation orientation,
gint *minimum_size,
@@ -481,16 +481,12 @@ eos_action_button_draw (GtkWidget *widget,
EosActionButton *button = EOS_ACTION_BUTTON (widget);
EosActionButtonPrivate *priv = button->priv;
gint x, y;
- GtkBorder default_border;
- GtkBorder default_outside_border;
- gboolean interior_focus;
gint focus_width;
gint focus_pad;
GtkAllocation allocation;
GtkStyleContext *context;
GtkStateFlags state;
- gboolean draw_focus;
- gint width, height, border_width, border_height, thickness;
+ gint width, height, border_width, border_height;
GtkBorder margin;
context = gtk_widget_get_style_context (widget);
@@ -502,7 +498,7 @@ eos_action_button_draw (GtkWidget *widget,
NULL);
gtk_style_context_get_margin(context,
- gtk_style_context_get_state (context),
+ state,
&margin);
gtk_widget_get_allocation (widget, &allocation);
@@ -514,7 +510,6 @@ eos_action_button_draw (GtkWidget *widget,
border_width = icon_sizes[priv->size].width;
border_height = icon_sizes[priv->size].height;
- thickness = icon_sizes[priv->size].border_width;
cairo_save (cr);
@@ -555,4 +550,6 @@ eos_action_button_draw (GtkWidget *widget,
gtk_widget_draw (GTK_WIDGET (priv->label_widget), cr);
cairo_restore (cr);
+
+ return FALSE;
}