summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gtk/gtkimcontextsimple.c4
-rw-r--r--gtk/updateiconcache.c3
2 files changed, 4 insertions, 3 deletions
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index 89221ce80e..38806d05c3 100644
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -553,8 +553,10 @@ no_sequence_matches (GtkIMContextSimple *context_simple,
if (i == n_compose - 1)
{
+ int j;
+
/* dead keys are never *really* dead */
- for (int j = 0; j < i; j++)
+ for (j = 0; j < i; j++)
{
ch = dead_key_to_unicode (priv->compose_buffer[j], &need_space);
if (ch)
diff --git a/gtk/updateiconcache.c b/gtk/updateiconcache.c
index 6703c8b9e8..787e718264 100644
--- a/gtk/updateiconcache.c
+++ b/gtk/updateiconcache.c
@@ -623,14 +623,13 @@ scan_directory (const gchar *base_path,
list = g_list_sort (list, (GCompareFunc) strcmp);
for (iterator = list; iterator; iterator = iterator->next)
{
- name = iterator->data;
-
gchar *path;
gboolean retval;
int flags = 0;
Image *image;
gchar *basename, *dot;
+ name = iterator->data;
path = g_build_filename (dir_path, name, NULL);
retval = g_file_test (path, G_FILE_TEST_IS_DIR);