? compile
? py-compile
? backends/Makefile
? backends/Makefile.in
? backends/gstreamer/Makefile
? backends/gstreamer/Makefile.in
? bindings/Makefile
? bindings/Makefile.in
? bindings/python/Makefile
? bindings/python/Makefile.in
? bindings/python/rb.c
? bindings/python/rhythmdb.c
? help/es/.xml2po.mo
? help/es/rhythmbox.xml
? metadata/rhythmbox-metadata
? metadata/test-metadata
? plugins/Makefile
? plugins/Makefile.in
? plugins/audioscrobbler/Makefile
? plugins/audioscrobbler/Makefile.in
? plugins/audioscrobbler/audioscrobbler.rb-plugin
? plugins/lirc/Makefile
? plugins/lirc/Makefile.in
? plugins/lirc/lirc.rb-plugin
? plugins/pythonconsole/Makefile
? plugins/pythonconsole/Makefile.in
? plugins/pythonconsole/pythonconsole.rb-plugin
? plugins/sample/Makefile
? plugins/sample/Makefile.in
? plugins/sample-python/Makefile
? plugins/sample-python/Makefile.in
? shell/rb-playlist-manager-glue.h
? widgets/libsexy/Makefile
? widgets/libsexy/Makefile.in
Index: lib/rb-debug.c
===================================================================
RCS file: /cvs/gnome/rhythmbox/lib/rb-debug.c,v
retrieving revision 1.12
diff -p -u -r1.12 rb-debug.c
--- lib/rb-debug.c	10 Apr 2006 15:17:48 -0000	1.12
+++ lib/rb-debug.c	11 Apr 2006 18:10:45 -0000
@@ -266,9 +266,9 @@ _rb_profile_log (const char *func,
 	}
 
 	if (profile_indent == 0) {
-		str = g_strdup_printf ("MARK: [%s]: [%s %d] %s %s", file, func, line, msg1 ? msg1 : "", msg2 ? msg2 : "");
+		str = g_strdup_printf ("MARK: [%s %s %d] %s %s", file, func, line, msg1 ? msg1 : "", msg2 ? msg2 : "");
 	} else {
-		str = g_strdup_printf ("MARK: [%s]: %*c [%s %d] %s %s", file, profile_indent - 1, ' ', func, line, msg1 ? msg1 : "", msg2 ? msg2 : "");
+		str = g_strdup_printf ("MARK: %*c [%s %s %d] %s %s", profile_indent - 1, ' ', file, func, line, msg1 ? msg1 : "", msg2 ? msg2 : "");
 	}
 
 	access (str, F_OK);
Index: plugins/rb-plugins-engine.c
===================================================================
RCS file: /cvs/gnome/rhythmbox/plugins/rb-plugins-engine.c,v
retrieving revision 1.3
diff -p -u -r1.3 rb-plugins-engine.c
--- plugins/rb-plugins-engine.c	29 Mar 2006 10:26:08 -0000	1.3
+++ plugins/rb-plugins-engine.c	11 Apr 2006 18:10:45 -0000
@@ -334,6 +334,7 @@ rb_plugins_engine_init (RBShell *shell)
 		g_warning ("rb is not able to initialize the plugins engine.");
 		return FALSE;
 	}
+	rb_profile_start ("plugins engine init");
 
 	rb_plugins = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, (GDestroyNotify)rb_plugin_info_free);
 
@@ -343,6 +344,8 @@ rb_plugins_engine_init (RBShell *shell)
 	rb_plugins_engine_load_all ();
 
 	garbage_collect_id = g_timeout_add_full (G_PRIORITY_LOW, 20000, garbage_collect_cb, NULL, NULL);
+
+	rb_profile_end ("plugins engine init");
 
 	return TRUE;
 }
Index: rhythmdb/rhythmdb.c
===================================================================
RCS file: /cvs/gnome/rhythmbox/rhythmdb/rhythmdb.c,v
retrieving revision 1.198
diff -p -u -r1.198 rhythmdb.c
--- rhythmdb/rhythmdb.c	9 Apr 2006 13:22:58 -0000	1.198
+++ rhythmdb/rhythmdb.c	11 Apr 2006 18:10:45 -0000
@@ -2426,6 +2426,7 @@ rhythmdb_load_thread_main (RhythmDB *db)
 void
 rhythmdb_load (RhythmDB *db)
 {
+	rb_profile_start ("loading db");
 	rhythmdb_thread_create (db, (GThreadFunc) rhythmdb_load_thread_main, db);
 
 #if 0
@@ -2447,6 +2448,7 @@ rhythmdb_load (RhythmDB *db)
 	result->type = RHYTHMDB_EVENT_DB_LOAD;
 	g_async_queue_push (db->priv->event_queue, result);
 #endif
+	rb_profile_end ("loading db");
 }
 
 static gpointer
Index: shell/main.c
===================================================================
RCS file: /cvs/gnome/rhythmbox/shell/main.c,v
retrieving revision 1.90
diff -p -u -r1.90 main.c
--- shell/main.c	2 Apr 2006 11:25:41 -0000	1.90
+++ shell/main.c	11 Apr 2006 18:10:45 -0000
@@ -137,6 +137,7 @@ main (int argc, char **argv)
 #if WITH_DBUS || WITH_BONOBO
 	GError *error = NULL;
 #endif
+	rb_profile_start ("starting rhythmbox");
 
 	struct poptOption popt_options[] =
 	{
@@ -197,25 +198,34 @@ main (int argc, char **argv)
         /* To pass options to GStreamer in 0.10, RB needs to use GOption, for
          * now, GStreamer can live without them (people can still use env
          * vars, after all) */
+	rb_profile_start ("initializing gstreamer");
         gst_init (NULL, NULL);
+	rb_profile_end ("initializing gstreamer");
 #endif
 #ifdef WITH_BONOBO
+	rb_profile_start ("initializing bonobo remote");
 	rb_remote_bonobo_preinit ();
+	rb_profile_end ("initializing bonobo remote");
 #endif
 
 	gtk_set_locale ();
+	rb_profile_start ("initializing gnome program");
 	program = gnome_program_init (PACKAGE, VERSION,
 				      LIBGNOMEUI_MODULE, argc+1, new_argv,
 				      GNOME_PARAM_POPT_TABLE, popt_options,
 				      GNOME_PARAM_HUMAN_READABLE_NAME, _("Rhythmbox"),
 				      GNOME_PARAM_APP_DATADIR, DATADIR,
 				      NULL);
+	rb_profile_end ("initializing gnome program");
+
 	g_object_get_property (G_OBJECT (program),
                                GNOME_PARAM_POPT_CONTEXT,
                                g_value_init (&context_as_value, G_TYPE_POINTER));
         poptContext = g_value_get_pointer (&context_as_value);
 
+	rb_profile_start ("initializing gnome auth manager");
 	gnome_authentication_manager_init ();
+	rb_profile_end ("initializing gnome auth manager");
 
 	g_random_set_seed (time(0));
 
@@ -242,6 +252,7 @@ main (int argc, char **argv)
 	activated = FALSE;
 
 #ifdef WITH_BONOBO
+	rb_profile_start ("creating bonobo remote");
 	rb_debug ("going to create Bonobo object");
 	bonobo = rb_remote_bonobo_new ();
 	client_proxy = NULL;
@@ -251,6 +262,7 @@ main (int argc, char **argv)
 			client_proxy = RB_REMOTE_CLIENT_PROXY (bonobo);
 		}
 	}
+	rb_profile_end ("creating bonobo remote");
 #endif
 #ifdef WITH_DBUS
 	rb_debug ("going to create DBus object");
@@ -407,12 +419,14 @@ main (int argc, char **argv)
 		gdk_notify_startup_complete ();
 	} else {
 
+		rb_profile_start ("mainloop");
 #ifdef WITH_BONOBO
                 /* Unfortunately Bonobo takes over the main loop ... */
 		bonobo_main ();
 #else
 		gtk_main ();
 #endif
+		rb_profile_end ("mainloop");
 
 		rb_debug ("out of toplevel loop");
 
@@ -426,6 +440,7 @@ main (int argc, char **argv)
 	g_strfreev (new_argv);
 
 	rb_debug ("THE END");
+	rb_profile_end ("starting rhythmbox");
 	exit (0);
 }
 
Index: shell/rb-shell.c
===================================================================
RCS file: /cvs/gnome/rhythmbox/shell/rb-shell.c,v
retrieving revision 1.426
diff -p -u -r1.426 rb-shell.c
--- shell/rb-shell.c	11 Apr 2006 10:27:46 -0000	1.426
+++ shell/rb-shell.c	11 Apr 2006 18:10:45 -0000
@@ -1362,7 +1362,7 @@ rb_shell_constructor (GType type,
 	rb_shell_select_source (shell, RB_SOURCE (shell->priv->library_source));
 
 	rb_plugins_engine_init (shell);
-	
+
 	/* GO GO GO! */
 	rb_debug ("loading database");
 	rhythmdb_load (shell->priv->db);
@@ -1499,10 +1499,13 @@ rb_shell_set_visibility (RBShell *shell,
 {
 	gboolean current_visible;
 
+	rb_profile_start ("changing shell visibility");
 
 	current_visible = rb_shell_get_visibility (shell);
-	if (!force && visible == current_visible)
+	if (!force && visible == current_visible) {
+		rb_profile_end ("changing shell visibility");
 		return;
+	}
 
 	/* FIXME - see below */
 	if (shell->priv->idle_hide_mainwindow_id > 0)
@@ -1550,6 +1553,7 @@ rb_shell_set_visibility (RBShell *shell,
 		eel_gconf_set_boolean (CONF_STATE_WINDOW_VISIBLE, FALSE);
 	}
 
+	rb_profile_end ("changing shell visibility");
 }
 
 static gboolean
@@ -1601,6 +1605,8 @@ rb_shell_sync_window_state (RBShell *she
 {
 	GdkGeometry hints;
 
+	rb_profile_start ("syncing window state");
+
 	if (shell->priv->window_small) {
 		hints.min_height = -1;
 		hints.min_width = -1;
@@ -1639,6 +1645,7 @@ rb_shell_sync_window_state (RBShell *she
 	gtk_window_move (GTK_WINDOW (shell->priv->window),
 			 shell->priv->window_x,
 			 shell->priv->window_y);
+	rb_profile_end ("syncing window state");
 }
 
 static void
@@ -3181,6 +3188,8 @@ rb_shell_present (RBShell *shell,
 		  guint32 timestamp,
 		  GError **error)
 {
+	rb_profile_start ("presenting shell");
+
 	rb_debug ("presenting with timestamp %u", timestamp);
 	gtk_widget_show (GTK_WIDGET (shell->priv->window));
 #if GTK_MINOR_VERSION >= 8
@@ -3189,6 +3198,8 @@ rb_shell_present (RBShell *shell,
 	gtk_window_present (GTK_WINDOW (shell->priv->window));
 	gdk_window_focus (GTK_WIDGET (shell->priv->window)->window, timestamp);
 #endif
+
+	rb_profile_end ("presenting shell");
 
 	return TRUE;
 }
