trace-view: Fix some GTK warnings

There were a few GTK warnings spitting out with the trace-view code.
This patch cleans up that code.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

2 files changed, 9 insertions, 7 deletions

diff --git a/trace-view-store.c b/trace-view-store.c
index 9e79a28..f26351a 100644
--- a/trace-view-store.c
+++ b/trace-view-store.c
@@ -209,8 +209,10 @@ trace_view_store_finalize (GObject *object)
         /* free all records and free all memory used by the list */
 #warning IMPLEMENT
 
-        if (store->spin)
-                g_object_unref(store->spin);
+        if (store->spin) {
+                gtk_widget_destroy(store->spin);
+                store->spin = NULL;
+        }
 
         /* must chain up - finalize parent */
         (* parent_class->finalize) (object);
@@ -438,7 +440,7 @@ trace_view_store_get_value (GtkTreeModel *tree_model,
                 usecs /= 1000;
                 secs = usecs / 1000000ULL;
                 usecs -= secs * 1000000ULL;
-                str = g_strdup_printf("%lu.%06lu", secs, usecs);
+                str = g_strdup_printf("%llu.%06llu", secs, usecs);
                 g_value_set_string(value, str);
                 g_free(str);
                 break;
@@ -914,12 +916,10 @@ void trace_view_store_set_spin_button(TraceViewStore *store, GtkWidget *spin)
 
         store->spin = spin;
 
+        g_object_ref(spin);
         gtk_spin_button_set_increments(GTK_SPIN_BUTTON(store->spin),
                                        1.0, 5.0);
-
         update_page(store);
-
-        g_object_ref(spin);
 }
 
 /* --- helper functions --- */
diff --git a/trace-view.c b/trace-view.c
index dc0cd90..f5cdf5e 100644
--- a/trace-view.c
+++ b/trace-view.c
@@ -106,6 +106,9 @@ spin_changed(gpointer data, GtkWidget *spin)
         val = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin));
 
         model = gtk_tree_view_get_model(tree);
+        /* This can be called when we NULL out the model */
+        if (!model)
+                return;
         page = trace_view_store_get_page(TRACE_VIEW_STORE(model));
         if (page == val)
                 return;
@@ -204,7 +207,6 @@ load_trace_view(GtkWidget *view, struct tracecmd_input *handle,
         model = create_trace_view_model(handle);
 
         trace_view_store_set_spin_button(TRACE_VIEW_STORE(model), spin);
-        g_object_unref(spin);
 
         gtk_tree_view_set_model(GTK_TREE_VIEW(view), model);