ui: init pointers to NULL

3 files changed, 46 insertions, 4 deletions

diff --git a/src/snappy.c b/src/snappy.c
index 8169e5f..f0af500 100644
--- a/src/snappy.c
+++ b/src/snappy.c
@@ -164,7 +164,7 @@ main (int argc, char *argv[])
   // User Interface
   ui = g_new (UserInterface, 1);
   ui->fullscreen = fullscreen;
-  ui->stage = NULL;
+  interface_init (ui);
   video_texture = clutter_texture_new ();
 
   clutter_gst_init (&argc, &argv);
@@ -191,7 +191,7 @@ main (int argc, char *argv[])
   }
 
   engine_load_uri (engine, uri);
-  interface_load (ui, uri);
+  interface_start (ui, uri);
 
   change_state (engine, "Paused");
   change_state (engine, "Playing");
diff --git a/src/user_interface.c b/src/user_interface.c
index 861e1c6..60d803b 100644
--- a/src/user_interface.c
+++ b/src/user_interface.c
@@ -840,6 +840,47 @@ update_volume (UserInterface * ui, gdouble volume)
 
 /* -------------------- non-static functions --------------------- */
 
+void
+interface_init (UserInterface * ui)
+{
+  ui->filename = NULL;
+  ui->fileuri = NULL;
+
+  ui->play_png = NULL;
+  ui->pause_png = NULL;
+
+  ui->volume_low_png = NULL;
+  ui->volume_high_png = NULL;
+
+  ui->duration_str = NULL;
+
+  ui->stage = NULL;
+  ui->texture = NULL;
+
+  ui->control_box = NULL;
+  ui->control_bg = NULL;
+  ui->control_title = NULL;
+  ui->control_play_toggle = NULL;
+
+  ui->control_seek1 = NULL;
+  ui->control_seek2 = NULL;
+  ui->control_seekbar = NULL;
+  ui->control_pos = NULL;
+
+  ui->volume_box = NULL;
+  ui->volume_low = NULL;
+  ui->volume_high = NULL;
+  ui->vol_int = NULL;
+  ui->vol_int_bg = NULL;
+  ui->volume_point = NULL;
+
+  ui->info_box = NULL;
+  ui->main_box = NULL;
+
+  ui->engine = NULL;
+  ui->screensaver = NULL;
+}
+
 gboolean
 interface_load_uri (UserInterface * ui, gchar * uri)
 {
@@ -854,7 +895,7 @@ interface_load_uri (UserInterface * ui, gchar * uri)
 }
 
 void
-interface_load (UserInterface * ui, gchar * uri)
+interface_start (UserInterface * ui, gchar * uri)
 {
   ClutterColor stage_color = { 0x00, 0x00, 0x00, 0x00 };
 
diff --git a/src/user_interface.h b/src/user_interface.h
index 83d7abd..2e584fc 100644
--- a/src/user_interface.h
+++ b/src/user_interface.h
@@ -105,8 +105,9 @@ struct _UserInterface
 };
 
 // Declaration of non-static functions
+void interface_init (UserInterface * ui);
 gboolean interface_load_uri (UserInterface * ui, gchar * uri);
-void interface_load (UserInterface * ui, gchar * uri);
+void interface_start (UserInterface * ui, gchar * uri);
 gboolean interface_update_controls (UserInterface * ui);
 
 G_END_DECLS