diff options
| author | raveit65 <[email protected]> | 2024-01-28 02:53:56 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2024-02-04 18:37:58 +0100 |
| commit | e663fbaeba760003b4088e567af0883534891e59 (patch) | |
| tree | fd7b6805cc5d0e022f526e6343bb2539aa12f54e /mate-panel/libpanel-util | |
| parent | 6a9848eb8388807d13c38cdaceabfc143f6640aa (diff) | |
| download | mate-panel-e663fbaeba760003b4088e567af0883534891e59.tar.bz2 mate-panel-e663fbaeba760003b4088e567af0883534891e59.tar.xz | |
Revert "Reduce scope of variables"
This reverts commit 96c7ebc6dc9e8b8327db04a9570054ee78743353.
Diffstat (limited to 'mate-panel/libpanel-util')
| -rw-r--r-- | mate-panel/libpanel-util/panel-color.c | 8 | ||||
| -rw-r--r-- | mate-panel/libpanel-util/panel-gtk.c | 3 | ||||
| -rw-r--r-- | mate-panel/libpanel-util/panel-keyfile.c | 5 |
3 files changed, 7 insertions, 9 deletions
diff --git a/mate-panel/libpanel-util/panel-color.c b/mate-panel/libpanel-util/panel-color.c index 661e6fb5..f6148aaa 100644 --- a/mate-panel/libpanel-util/panel-color.c +++ b/mate-panel/libpanel-util/panel-color.c @@ -17,6 +17,7 @@ rgb_to_hls (gdouble *r, gdouble *g, gdouble *b) gdouble green; gdouble blue; gdouble h, l, s; + gdouble delta; red = *r; green = *g; @@ -49,8 +50,6 @@ rgb_to_hls (gdouble *r, gdouble *g, gdouble *b) h = 0; if (max != min) { - gdouble delta; - if (l <= 0.5) s = (max - min) / (max + min); else @@ -85,9 +84,11 @@ rgb_to_hls (gdouble *r, gdouble *g, gdouble *b) static void hls_to_rgb (gdouble *h, gdouble *l, gdouble *s) { + gdouble hue; gdouble lightness; gdouble saturation; gdouble m1, m2; + gdouble r, g, b; lightness = *l; saturation = *s; @@ -103,9 +104,6 @@ hls_to_rgb (gdouble *h, gdouble *l, gdouble *s) *l = lightness; *s = lightness; } else { - gdouble hue; - gdouble r, g, b; - hue = *h + 120; while (hue > 360) hue -= 360; diff --git a/mate-panel/libpanel-util/panel-gtk.c b/mate-panel/libpanel-util/panel-gtk.c index 3672fca8..d638d75d 100644 --- a/mate-panel/libpanel-util/panel-gtk.c +++ b/mate-panel/libpanel-util/panel-gtk.c @@ -119,6 +119,7 @@ panel_file_chooser_dialog_new_valist (const gchar *title, { GtkWidget *result; const char *button_text = first_button_text; + gint response_id; result = g_object_new (GTK_TYPE_FILE_CHOOSER_DIALOG, "title", title, @@ -130,7 +131,7 @@ panel_file_chooser_dialog_new_valist (const gchar *title, while (button_text) { - gint response_id = va_arg (varargs, gint); + response_id = va_arg (varargs, gint); if (g_strcmp0 (button_text, "process-stop") == 0) panel_dialog_add_button (GTK_DIALOG (result), _("_Cancel"), button_text, response_id); diff --git a/mate-panel/libpanel-util/panel-keyfile.c b/mate-panel/libpanel-util/panel-keyfile.c index b98058c3..0b0104ef 100644 --- a/mate-panel/libpanel-util/panel-keyfile.c +++ b/mate-panel/libpanel-util/panel-keyfile.c @@ -53,6 +53,8 @@ _panel_key_file_make_executable (const gchar *path) { GFile *file; GFileInfo *info; + guint32 current_perms; + guint32 new_perms; file = g_file_new_for_path (path); @@ -70,9 +72,6 @@ _panel_key_file_make_executable (const gchar *path) } if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_UNIX_MODE)) { - guint32 current_perms; - guint32 new_perms; - current_perms = g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_UNIX_MODE); new_perms = current_perms | S_IXGRP | S_IXUSR | S_IXOTH; |