summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormonsta <[email protected]>2016-01-04 20:32:45 +0300
committermonsta <[email protected]>2016-01-04 20:32:45 +0300
commit73f1dbc41f35cc3729d8ac8727e654e8e3e20ac5 (patch)
tree446de50937adcd1d5cb7f80e86954acb744f184d
parent98576d25e966aded1c3f67c41c146e15e4827ced (diff)
downloadmate-panel-73f1dbc41f35cc3729d8ac8727e654e8e3e20ac5.tar.bz2
mate-panel-73f1dbc41f35cc3729d8ac8727e654e8e3e20ac5.tar.xz
background: all functions should have PanelBackground as 1st argument
-rw-r--r--mate-panel/mate-panel-applet-frame.c2
-rw-r--r--mate-panel/panel-background.c4
-rw-r--r--mate-panel/panel-background.h2
-rw-r--r--mate-panel/panel-menu-bar.c2
-rw-r--r--mate-panel/panel-separator.c2
-rw-r--r--mate-panel/panel-widget.c2
6 files changed, 7 insertions, 7 deletions
diff --git a/mate-panel/mate-panel-applet-frame.c b/mate-panel/mate-panel-applet-frame.c
index ab301838..015b3d5c 100644
--- a/mate-panel/mate-panel-applet-frame.c
+++ b/mate-panel/mate-panel-applet-frame.c
@@ -649,7 +649,7 @@ mate_panel_applet_frame_change_background (MatePanelAppletFrame *frame,
background = &PANEL_WIDGET (parent)->background;
#if GTK_CHECK_VERSION (3, 0, 0)
- panel_background_apply_css (GTK_WIDGET (frame), background);
+ panel_background_apply_css (background, GTK_WIDGET (frame));
#else
panel_background_change_background_on_widget (background,
GTK_WIDGET (frame));
diff --git a/mate-panel/panel-background.c b/mate-panel/panel-background.c
index 4a899f4a..1974dbc4 100644
--- a/mate-panel/panel-background.c
+++ b/mate-panel/panel-background.c
@@ -96,7 +96,7 @@ set_pixbuf_background (PanelBackground *background)
}
#if GTK_CHECK_VERSION (3, 0, 0)
-void panel_background_apply_css (GtkWidget* widget, PanelBackground *background)
+void panel_background_apply_css (PanelBackground *background, GtkWidget *widget)
{
GtkStyleContext *context;
PanelBackgroundType effective_type;
@@ -238,7 +238,7 @@ panel_background_prepare (PanelBackground *background)
if (GTK_IS_WIDGET (widget)) {
#if GTK_CHECK_VERSION (3, 0, 0)
- panel_background_apply_css (gtk_widget_get_toplevel(widget), background);
+ panel_background_apply_css (background, gtk_widget_get_toplevel(widget));
#endif
gtk_widget_set_app_paintable(widget,TRUE);
gtk_widget_queue_draw (widget);
diff --git a/mate-panel/panel-background.h b/mate-panel/panel-background.h
index eabcdc3e..2ca1c451 100644
--- a/mate-panel/panel-background.h
+++ b/mate-panel/panel-background.h
@@ -158,7 +158,7 @@ PanelBackgroundType
panel_background_effective_type (PanelBackground *background);
#if GTK_CHECK_VERSION (3, 0, 0)
-void panel_background_apply_css(GtkWidget* widget, PanelBackground *background);
+void panel_background_apply_css(PanelBackground *background, GtkWidget *widget);
#else
void panel_background_change_background_on_widget (PanelBackground *background,
GtkWidget *widget);
diff --git a/mate-panel/panel-menu-bar.c b/mate-panel/panel-menu-bar.c
index 99381bf2..a5ca9b11 100644
--- a/mate-panel/panel-menu-bar.c
+++ b/mate-panel/panel-menu-bar.c
@@ -479,7 +479,7 @@ void panel_menu_bar_popup_menu(PanelMenuBar* menubar, guint32 activate_time)
void panel_menu_bar_change_background(PanelMenuBar* menubar)
{
#if GTK_CHECK_VERSION (3, 0, 0)
- panel_background_apply_css(GTK_WIDGET(menubar), &menubar->priv->panel->background);
+ panel_background_apply_css(&menubar->priv->panel->background, GTK_WIDGET(menubar));
#else
panel_background_change_background_on_widget(&menubar->priv->panel->background, GTK_WIDGET(menubar));
#endif
diff --git a/mate-panel/panel-separator.c b/mate-panel/panel-separator.c
index b5a41487..0ea4908c 100644
--- a/mate-panel/panel-separator.c
+++ b/mate-panel/panel-separator.c
@@ -350,7 +350,7 @@ void
panel_separator_change_background (PanelSeparator *separator)
{
#if GTK_CHECK_VERSION (3, 0, 0)
- panel_background_apply_css(GTK_WIDGET(separator), &separator->priv->panel->background);
+ panel_background_apply_css(&separator->priv->panel->background, GTK_WIDGET(separator));
#else
panel_background_change_background_on_widget(&separator->priv->panel->background, GTK_WIDGET(separator));
#endif
diff --git a/mate-panel/panel-widget.c b/mate-panel/panel-widget.c
index 0f59a79c..1930e797 100644
--- a/mate-panel/panel-widget.c
+++ b/mate-panel/panel-widget.c
@@ -1653,7 +1653,7 @@ panel_widget_style_set (GtkWidget *widget, GtkStyle *previous_style)
state = gtk_widget_get_state_flags (widget);
gtk_style_context_add_class(context,"gnome-panel-menu-bar");
gtk_style_context_add_class(context,"mate-panel-menu-bar");
- panel_background_apply_css (widget, &PANEL_WIDGET (widget)->background);
+ panel_background_apply_css (&PANEL_WIDGET (widget)->background, widget);
gtk_style_context_get_background_color (context, state, &bg_color);
gtk_style_context_get (context, state, "background-image", &bg_image, NULL);