Index: gnome-cd/gst-cdrom.c
===================================================================
RCS file: /cvs/gnome/gnome-media/gnome-cd/gst-cdrom.c,v
retrieving revision 1.3
diff -u -p -r1.3 gst-cdrom.c
--- gnome-cd/gst-cdrom.c	20 Jan 2006 10:44:16 -0000	1.3
+++ gnome-cd/gst-cdrom.c	27 Jan 2006 11:27:50 -0000
@@ -1,6 +1,7 @@
 /*
  * gst-cdrom.c: Gstreamer Audio CD controlling functions.
  *
+ * Copyright (C) 2001 Iain Holmes <iain@ximian.com>
  * Copyright (C) 2005 Tim-Philipp Müller <tim centricular net>
  *
  * Remaining issues:
@@ -285,7 +286,8 @@ gst_cdrom_eject (GnomeCDRom * gnome_cdro
   } else {
     GST_DEBUG ("tray seems to be open, closing tray ...");
     /* Try to close the tray if it's open */
-    res = gnome_cdrom_close_tray (gnome_cdrom, error); ///// FIXME: use gst_cdrom_close_tray() directly once implemented /////
+    /* FIXME: use gst_cdrom_close_tray() directly once implemented */
+    res = gnome_cdrom_close_tray (gnome_cdrom, error);
   }
 
   /* FIXME: update our status in cdrom->priv->status as well? */
@@ -825,7 +827,7 @@ gst_cdrom_set_device (GnomeCDRom *gnome_
   return TRUE;
 }
 
-/********** FIXME: see if there's anything else we need to do here ******/
+/* FIXME: see if there's anything else we need to do here */
 
 static void
 gst_cdrom_update_cd (GnomeCDRom * gnome_cdrom)
@@ -979,7 +981,7 @@ gst_cdrom_update_tray_status (GstCDRom *
   return FALSE;
 }
 
-/********** FIXME: do tray status checking ******/
+/* FIXME: do tray status checking */
 
 static gboolean
 gst_cdrom_get_status (GnomeCDRom * gnome_cdrom, GnomeCDRomStatus ** status,
Index: gstreamer-properties/gstreamer-properties.c
===================================================================
RCS file: /cvs/gnome/gnome-media/gstreamer-properties/gstreamer-properties.c,v
retrieving revision 1.15
diff -u -p -r1.15 gstreamer-properties.c
--- gstreamer-properties/gstreamer-properties.c	19 Jan 2006 23:52:22 -0000	1.15
+++ gstreamer-properties/gstreamer-properties.c	27 Jan 2006 11:27:50 -0000
@@ -40,6 +40,7 @@
 #define WID(s) glade_xml_get_widget (interface_xml, s)
 static GladeXML *interface_xml = NULL;
 static GtkDialog *main_window;
+static GConfClient *gconf_client; /* NULL */
 
 static gchar pipeline_editor_property[] = "gstp-editor";
 static gchar pipeline_desc_property[] = "gstp-pipe-desc";
@@ -54,16 +55,13 @@ gst_properties_gconf_get_full_key (const
 gchar *
 gst_properties_gconf_get_string (const gchar * key)
 {
-  GConfClient *client;
   GError *error = NULL;
   gchar *value = NULL;
   gchar *full_key;
 
   full_key = gst_properties_gconf_get_full_key (key);
 
-  client = gconf_client_get_default ();
-
-  value = gconf_client_get_string (client, full_key, &error);
+  value = gconf_client_get_string (gconf_client, full_key, &error);
   g_free (full_key);
 
   if (error) {
@@ -78,14 +76,12 @@ gst_properties_gconf_get_string (const g
 void
 gst_properties_gconf_set_string (const gchar * key, const gchar * value)
 {
-  GConfClient *client;
   GError *error = NULL;
   gchar *full_key;
 
   full_key = gst_properties_gconf_get_full_key (key);
-  client = gconf_client_get_default ();
 
-  gconf_client_set_string (client, full_key, value, &error);
+  gconf_client_set_string (gconf_client, full_key, value, &error);
   g_free (full_key);
 
   if (error) {
@@ -434,6 +430,8 @@ main (int argc, char **argv)
         NULL);
   }
 
+  gconf_client = gconf_client_get_default ();
+
   if (!interface_xml) {
     GtkWidget *dialog;
 
@@ -454,5 +452,7 @@ main (int argc, char **argv)
   if (main_window)
     gtk_main ();
 
+  g_object_unref (gconf_client);
+
   return 0;
 }
