summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Granseuer <jensgr@gmx.net>2008-04-07 20:50:37 +0000
committerJens Granseuer <jensg@src.gnome.org>2008-04-07 20:50:37 +0000
commit48261330de4e99f57bdcd20e0c21328abed1c3bd (patch)
treef531f280f2d88aa6e8c27e43e39ffc0e7c63b8f7
parent300be6e03b1d6e9795ee7a5dc957961a6e43448d (diff)
downloadmetacity-48261330de4e99f57bdcd20e0c21328abed1c3bd.tar.gz
reorder declarations so we don't break C89 compilers.
2008-04-07 Jens Granseuer <jensgr@gmx.net> * src/core/session.c: (save_state), (warn_about_lame_clients_and_finish_interact): reorder declarations so we don't break C89 compilers. svn path=/trunk/; revision=3677
-rw-r--r--ChangeLog6
-rw-r--r--src/core/session.c15
2 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index c31b1abc..ac355dbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-07 Jens Granseuer <jensgr@gmx.net>
+
+ * src/core/session.c: (save_state),
+ (warn_about_lame_clients_and_finish_interact):
+ reorder declarations so we don't break C89 compilers.
+
2008-04-06 Thomas Thurman <tthurman@gnome.org>
* NEWS: 2.23.5 release.
diff --git a/src/core/session.c b/src/core/session.c
index 5c9bcc8f..746c09d8 100644
--- a/src/core/session.c
+++ b/src/core/session.c
@@ -807,6 +807,9 @@ save_state (void)
char *metacity_dir;
char *session_dir;
FILE *outfile;
+ GSList *windows;
+ GSList *tmp;
+ int stack_position;
g_assert (client_id);
@@ -871,11 +874,10 @@ save_state (void)
fprintf (outfile, "<metacity_session id=\"%s\">\n",
client_id);
-
- GSList *windows = meta_display_list_windows (meta_get_display ());
- GSList *tmp;
- int stack_position = 0;
-
+
+ windows = meta_display_list_windows (meta_get_display ());
+ stack_position = 0;
+
windows = g_slist_sort (windows, meta_display_stack_cmp);
tmp = windows;
stack_position = 0;
@@ -1782,6 +1784,7 @@ static void
warn_about_lame_clients_and_finish_interact (gboolean shutdown)
{
GSList *lame;
+ GSList *windows;
char **argv;
int i;
GSList *tmp;
@@ -1795,7 +1798,7 @@ warn_about_lame_clients_and_finish_interact (gboolean shutdown)
char timestampbuf[32];
lame = NULL;
- GSList *windows = meta_display_list_windows (meta_get_display ());
+ windows = meta_display_list_windows (meta_get_display ());
tmp = windows;
while (tmp != NULL)
{