From 2428c63de10dfbb128c58aafb29ce1c22db32400 Mon Sep 17 00:00:00 2001 From: "Todd T. Fries" Date: Wed, 8 Aug 2012 10:53:26 -0500 Subject: fix for() loop, s/settings/name of gtk widget/, nix main_window --- about.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/about.c b/about.c index e415938..0ee45cf 100644 --- a/about.c +++ b/about.c @@ -2084,6 +2084,8 @@ show_g_object_settings(GObject *o, char *str, int recurse) const gchar *tname; GValue value; GParamSpec **proplist; + char *tmpsettings; + const gchar *name; if (!G_IS_OBJECT(o)) { fprintf(stderr, "%s is not a g_object\n", str); @@ -2091,12 +2093,18 @@ show_g_object_settings(GObject *o, char *str, int recurse) } proplist = g_object_class_list_properties( G_OBJECT_GET_CLASS(o), &n_props); + + if (GTK_IS_WIDGET(o)) { + name = gtk_widget_get_name(GTK_WIDGET(o)); + } else { + name = "settings"; + } if (n_props == 0) { - body = g_strdup("settings[0] = { }"); + body = g_strdup_printf("%s[0] = { }", name); goto end_show_g_objects; } - body = g_strdup_printf("settings[%d] = {\n", n_props); + body = g_strdup_printf("%s[%d] = {\n", name, n_props); for (i=0; i < n_props; i++) { pspec = proplist[i]; tname = G_OBJECT_TYPE_NAME(pspec); @@ -2186,7 +2194,6 @@ int allthethings(struct tab *t, struct karg *arg) { char *page, *body, *b; - extern GtkWidget *main_window; GList *list, *liter; int toplevelcount = 0; @@ -2198,7 +2205,7 @@ allthethings(struct tab *t, struct karg *arg) "session", 1); #endif list = gtk_window_list_toplevels(); - for(liter = list; liter = liter->next; liter != NULL) { + for(liter = list; liter != NULL; liter = liter->next) { b = g_strdup_printf("toplevel#%x", toplevelcount++); body = xt_append_settings(body, G_OBJECT(liter->data), b, 1); -- cgit 1.4.1-2-gfad0