[nautilus-sendto/gnome-3-6] Only use C90 declarations
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-sendto/gnome-3-6] Only use C90 declarations
- Date: Tue, 4 Sep 2012 23:21:03 +0000 (UTC)
commit 88ea1b6b8aadb5590ad4b887a0cba8ad7d3fbeb4
Author: Colin Walters <walters verbum org>
Date: Tue Sep 4 19:20:02 2012 -0400
Only use C90 declarations
Fixes the build with newer gnome-common.
src/plugins/gajim/gajim.c | 3 ++-
src/plugins/pidgin/pidgin.c | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/src/plugins/gajim/gajim.c b/src/plugins/gajim/gajim.c
index 088c69b..88825a8 100644
--- a/src/plugins/gajim/gajim.c
+++ b/src/plugins/gajim/gajim.c
@@ -198,6 +198,7 @@ _get_contacts (void)
gchar **accounts;
gchar **account_iter;
gchar *account;
+ gpointer iconset_ptr;
error = NULL;
@@ -213,7 +214,7 @@ _get_contacts (void)
_handle_dbus_exception(error, TRUE);
return FALSE;
}
- gpointer iconset_ptr = g_hash_table_lookup(prefs_map, "iconset");
+ iconset_ptr = g_hash_table_lookup(prefs_map, "iconset");
if (iconset_ptr != NULL) {
iconset = g_strdup((gchar *)iconset_ptr);
} else {
diff --git a/src/plugins/pidgin/pidgin.c b/src/plugins/pidgin/pidgin.c
index 5d9b52e..7ae9b81 100644
--- a/src/plugins/pidgin/pidgin.c
+++ b/src/plugins/pidgin/pidgin.c
@@ -231,6 +231,7 @@ add_pidgin_contacts_to_model (GtkTreeStore *store,
g_hash_table_iter_init (&hiter, contact_hash);
while (g_hash_table_iter_next (&hiter, NULL, (gpointer)&contacts_group)) {
gint accounts;
+ gint i;
dat = g_ptr_array_index (contacts_group, 0);
@@ -239,7 +240,6 @@ add_pidgin_contacts_to_model (GtkTreeStore *store,
gtk_tree_store_append (store, parent, NULL);
gtk_tree_store_set (store, parent, COL_ICON, NULL, COL_ALIAS, dat->alias, -1);
- gint i;
for (i = 0; i < accounts; ++i) {
dat = g_ptr_array_index (contacts_group, i);
@@ -444,9 +444,9 @@ destroy (NstPlugin *plugin)
g_hash_table_iter_init (&iter, contact_hash);
while (g_hash_table_iter_next (&iter, NULL, (gpointer)&contacts_group)) {
gint accounts;
+ gint i;
accounts = contacts_group->len;
- gint i;
for (i = 0; i < accounts; ++i) {
dat = g_ptr_array_index (contacts_group, i);
free_contact (dat);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]