diff --git a/demos/gtk-demo/fishbowl.c b/demos/gtk-demo/fishbowl.c index 6cc2dfc1a2..bc3848fb18 100644 --- a/demos/gtk-demo/fishbowl.c +++ b/demos/gtk-demo/fishbowl.c @@ -249,6 +249,14 @@ fishbowl_changes_toggled_cb (GtkToggleButton *button, gtk_button_set_icon_name (GTK_BUTTON (button), "changes-allow"); } +char * +format_header_cb (GObject *object, + guint count, + double fps) +{ + return g_strdup_printf ("%u Icons, %.2f fps", count, fps); +} + GtkWidget * do_fishbowl (GtkWidget *do_widget) { diff --git a/demos/gtk-demo/fishbowl.ui b/demos/gtk-demo/fishbowl.ui index fcf5d38fa4..b174e416fb 100644 --- a/demos/gtk-demo/fishbowl.ui +++ b/demos/gtk-demo/fishbowl.ui @@ -28,22 +28,12 @@ - fps - - - - - - - - - - Icons, - - - - - + + + bowl + bowl + + diff --git a/demos/gtk-demo/gtkfishbowl.c b/demos/gtk-demo/gtkfishbowl.c index 0d9f85f124..58c2c5a182 100644 --- a/demos/gtk-demo/gtkfishbowl.c +++ b/demos/gtk-demo/gtkfishbowl.c @@ -53,7 +53,6 @@ enum { PROP_BENCHMARK, PROP_COUNT, PROP_FRAMERATE, - PROP_FRAMERATE_STRING, PROP_UPDATE_DELAY, NUM_PROPERTIES }; @@ -289,14 +288,6 @@ gtk_fishbowl_get_property (GObject *object, g_value_set_double (value, gtk_fishbowl_get_framerate (fishbowl)); break; - case PROP_FRAMERATE_STRING: - { - char *s = g_strdup_printf ("%.2f", gtk_fishbowl_get_framerate (fishbowl)); - g_value_set_string (value, s); - g_free (s); - } - break; - case PROP_UPDATE_DELAY: g_value_set_int64 (value, gtk_fishbowl_get_update_delay (fishbowl)); break; @@ -350,13 +341,6 @@ gtk_fishbowl_class_init (GtkFishbowlClass *klass) 0, G_PARAM_READABLE); - props[PROP_FRAMERATE_STRING] = - g_param_spec_string ("framerate-string", - "Framerate as string", - "Framerate as string, with 2 decimals", - NULL, - G_PARAM_READABLE); - props[PROP_UPDATE_DELAY] = g_param_spec_int64 ("update-delay", "Update delay", @@ -508,7 +492,6 @@ gtk_fishbowl_do_update (GtkFishbowl *fishbowl) priv->framerate = ((int)(priv->framerate * 100))/100.0; g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_FRAMERATE]); - g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_FRAMERATE_STRING]); if (!priv->benchmark) return;