X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fcallbacks.c;h=0d2aa7697b16a70deb4f8d2e48d039c011a703d5;hb=44946a6f8be82a70e65ca534541183a26fdb804b;hp=e2b8c3c40e5456feb047c20d7b9c2265d8090e90;hpb=7ff02765740463bed65b83d61b1d073d99a1b2fc;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index e2b8c3c4..0d2aa769 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -18,6 +18,7 @@
 #include <string.h>
 #include <fcntl.h>
 #include <sys/stat.h>
+#include <time.h>
 
 #if !defined(_WIN32)
 #include <poll.h>
@@ -27,7 +28,7 @@
 
 #include <netinet/in.h>
 #include <netdb.h>
-#include <gtkhtml/gtkhtml.h>
+#include <webkit/webkit.h>
 #include <libnotify/notify.h>
 #else
 #define WINVER 0x0500
@@ -44,6 +45,7 @@
 #include "callbacks.h"
 #include "queuehandler.h"
 #include "audiohandler.h"
+#include "subtitlehandler.h"
 #include "resources.h"
 #include "settings.h"
 #include "presets.h"
@@ -59,6 +61,12 @@ static void update_chapter_list(signal_user_data_t *ud);
 static GList* dvd_device_list();
 static void prune_logs(signal_user_data_t *ud);
 void ghb_notify_done(signal_user_data_t *ud);
+gpointer ghb_check_update(signal_user_data_t *ud);
+static gboolean ghb_can_shutdown_gpm();
+static void ghb_shutdown_gpm();
+static gboolean ghb_can_suspend_gpm();
+static void ghb_suspend_gpm();
+static gboolean appcast_busy = FALSE;
 
 // This is a dependency map used for greying widgets
 // that are dependent on the state of another widget.
@@ -276,7 +284,7 @@ on_quit1_activate(GtkMenuItem *quit, signal_user_data_t *ud)
 	g_debug("on_quit1_activate ()");
 	if (state & GHB_STATE_WORKING)
 	{
-		if (ghb_cancel_encode("Closing HandBrake will terminate encoding.\n"))
+		if (ghb_cancel_encode2(ud, "Closing HandBrake will terminate encoding.\n"))
 		{
 			ghb_hb_cleanup(FALSE);
 			prune_logs(ud);
@@ -291,9 +299,10 @@ on_quit1_activate(GtkMenuItem *quit, signal_user_data_t *ud)
 }
 
 gboolean
-uppers_and_unders(const gchar *str)
+uppers_and_unders(gchar *str)
 {
 	if (str == NULL) return FALSE;
+	str = g_strchomp(g_strchug(str));
 	while (*str)
 	{
 		if (*str == ' ')
@@ -360,47 +369,70 @@ get_dvd_device_name(GDrive *gd)
 }
 #endif
 
+static GHashTable *volname_hash = NULL;
+static GMutex     *volname_mutex = NULL;
+
+static void
+free_volname_key(gpointer data)
+{
+	if (data != NULL)
+		g_free(data);
+}
+
+static void
+free_volname_value(gpointer data)
+{
+	if (data != NULL)
+		g_free(data);
+}
+
 #if defined(_WIN32)
 static gchar*
-get_dvd_volume_name(const gchar *drive)
+get_direct_dvd_volume_name(const gchar *drive)
 {
-	gchar *result;
+	gchar *result = NULL;
 	gchar vname[51], fsname[51];
-	if (GetVolumeInformation(drive, vname, 50, NULL, NULL, NULL, fsname, 51))
+
+	if (GetVolumeInformation(drive, vname, 50, NULL, NULL, NULL, fsname, 50))
 	{
-		result = g_strdup_printf("%s (%s)", vname, drive);
-	}
-	else
-	{
-		result = g_strdup_printf("%s", drive);
+		result = g_strdup_printf("%s", vname);
 	}
 	return result;
 }
 #else
 static gchar*
-get_dvd_volume_name(GDrive *gd)
+get_direct_dvd_volume_name(const gchar *drive)
 {
-	gchar *label;
+	gchar *result;
+
+	result = ghb_dvd_volname (drive);
+	return result;
+}
+#endif
+
+static gchar*
+get_dvd_volume_name(gpointer gd)
+{
+	gchar *label = NULL;
 	gchar *result;
 	gchar *drive;
 
-	drive = g_drive_get_identifier(gd, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
-	if (g_drive_has_media (gd))
+	drive = get_dvd_device_name(gd);
+	g_mutex_lock(volname_mutex);
+	label = g_strdup(g_hash_table_lookup(volname_hash, drive));
+	g_mutex_unlock(volname_mutex);
+	if (label != NULL)
 	{
-		label = ghb_dvd_volname (drive);
-		if (label != NULL)
-		{
-			if (uppers_and_unders(label))
-			{
-				camel_convert(label);
-			}
-			result = g_strdup_printf("%s - %s", drive, label);
-			g_free(label);
-		}
-		else
+		if (uppers_and_unders(label))
 		{
-			result = g_strdup_printf("%s", drive);
+			camel_convert(label);
 		}
+#if defined(_WIN32)
+		result = g_strdup_printf("%s (%s)", label, drive);
+#else
+		result = g_strdup_printf("%s - %s", drive, label);
+#endif
+		g_free(label);
 	}
 	else
 	{
@@ -409,8 +441,107 @@ get_dvd_volume_name(GDrive *gd)
 	g_free(drive);
 	return result;
 }
+
+void
+ghb_volname_cache_init(void)
+{
+	volname_mutex = g_mutex_new();
+	volname_hash = g_hash_table_new_full(g_str_hash, g_str_equal,
+										free_volname_key, free_volname_value);
+}
+
+static void
+free_drive(gpointer drive)
+{
+#if defined(_WIN32)
+		g_free(drive);
+#else
+		g_object_unref(drive);
 #endif
+}
 
+gpointer
+ghb_cache_volnames(signal_user_data_t *ud)
+{
+	GList *link, *drives;
+
+	g_debug("ghb_cache_volnames()");
+	link = drives = dvd_device_list();
+	if (drives == NULL)
+		return NULL;
+
+	g_mutex_lock(volname_mutex);
+	g_hash_table_remove_all(volname_hash);
+	while (link != NULL)
+	{
+		gchar *name, *drive;
+
+#if !defined(_WIN32)
+		if (!g_drive_has_media (link->data))
+		{
+			g_object_unref(link->data);
+			link = link->next;
+			continue;
+		}
+#endif
+		drive = get_dvd_device_name(link->data);
+		name = get_direct_dvd_volume_name(drive);
+
+		if (drive != NULL && name != NULL)
+		{
+			g_hash_table_insert(volname_hash, drive, name);
+		}
+		else
+		{
+			if (drive != NULL)
+				g_free(drive);
+			if (name != NULL)
+				g_free(name);
+		}
+	
+		free_drive(link->data);
+		link = link->next;
+	}
+	g_mutex_unlock(volname_mutex);
+
+	g_list_free(drives);
+
+	g_idle_add((GSourceFunc)ghb_file_menu_add_dvd, ud);
+
+	return NULL;
+}
+
+static const gchar*
+get_extension(signal_user_data_t *ud)
+{
+	int container;
+	const gchar *extension = "error";
+	GValue *audio_list;
+
+	container = ghb_settings_combo_int(ud->settings, "FileFormat");
+	if (container == HB_MUX_MP4)
+	{
+		extension = "mp4";
+		audio_list = ghb_settings_get_value(ud->settings, "audio_list");
+		if (ghb_ac3_in_audio_list (audio_list))
+		{
+			extension = "m4v";
+		}
+		else if (ghb_settings_get_boolean(ud->settings, "ChapterMarkers"))
+		{
+			extension = "m4v";
+		}
+		else if (ghb_settings_get_boolean(ud->settings, "UseM4v"))
+		{
+			extension = "m4v";
+		}
+	}
+	else if (container == HB_MUX_MKV)
+	{
+		extension = "mkv";
+	}
+	return extension;
+}
 
 static void
 set_destination(signal_user_data_t *ud)
@@ -419,12 +550,13 @@ set_destination(signal_user_data_t *ud)
 	if (ghb_settings_get_boolean(ud->settings, "use_source_name"))
 	{
 		GString *str = g_string_new("");
-		gchar *vol_name, *filename, *extension;
+		gchar *vol_name, *filename;
+		const gchar *extension;
 		gchar *new_name;
 		gint title;
 		
 		filename = ghb_settings_get_string(ud->settings, "dest_file");
-		extension = ghb_settings_get_string(ud->settings, "FileFormat");
+		extension = get_extension(ud);
 		vol_name = ghb_settings_get_string(ud->settings, "volume_label");
 		g_string_append_printf(str, "%s", vol_name);
 		title = ghb_settings_combo_int(ud->settings, "title");
@@ -459,7 +591,6 @@ set_destination(signal_user_data_t *ud)
 		new_name = g_string_free(str, FALSE);
 		ghb_ui_update(ud, "dest_file", ghb_string_value(new_name));
 		g_free(filename);
-		g_free(extension);
 		g_free(vol_name);
 		g_free(new_name);
 	}
@@ -468,21 +599,17 @@ set_destination(signal_user_data_t *ud)
 static gchar*
 get_file_label(const gchar *filename)
 {
-	static gchar *containers[] = 
-		{".vob", ".mpg", ".m2ts", ".mkv", ".mp4", ".m4v", ".avi", ".ogm", NULL};
-	gchar *base;
-	gint ii;
+	gchar *base, *pos, *end;
 
 	base = g_path_get_basename(filename);
-	for (ii = 0; containers[ii] != NULL; ii++)
+	pos = strrchr(base, '.');
+	if (pos != NULL)
 	{
-		if (g_str_has_suffix(base, containers[ii]))
-		{
-			gchar *pos;
-			pos = strrchr(base, '.');
+		// If the last '.' is within 4 chars of end of name, assume
+		// there is an extension we want to strip.
+		end = &base[strlen(base) - 1];
+		if (end - pos <= 4)
 			*pos = 0;
-			break;
-		}
 	}
 	return base;
 }
@@ -515,7 +642,7 @@ resolve_drive_name(gchar *filename)
 }
 
 static gboolean
-update_source_label(signal_user_data_t *ud, const gchar *source)
+update_source_label(signal_user_data_t *ud, const gchar *source, gboolean update_dest)
 {
 	gchar *label = NULL;
 	gint len;
@@ -523,8 +650,8 @@ update_source_label(signal_user_data_t *ud, const gchar *source)
 	gchar *start;
 	gchar *filename = g_strdup(source);
 	
+	g_debug("update_source_label()");
 	len = strlen(filename);
-	if (filename[len-1] == G_DIR_SEPARATOR) filename[len-1] = 0;
 	if (g_file_test(filename, G_FILE_TEST_IS_DIR))
 	{
 		// Skip dos drive letters
@@ -539,6 +666,7 @@ update_source_label(signal_user_data_t *ud, const gchar *source)
 		}
 		else
 		{
+			if (filename[len-1] == G_DIR_SEPARATOR) filename[len-1] = 0;
 			if (start != NULL)
 				start++;
 			else
@@ -596,7 +724,8 @@ update_source_label(signal_user_data_t *ud, const gchar *source)
 		gtk_label_set_text (GTK_LABEL(widget), label);
 		ghb_settings_set_string(ud->settings, "volume_label", label);
 		g_free(label);
-		set_destination(ud);
+		if (update_dest)
+			set_destination(ud);
 	}
 	else
 	{
@@ -611,7 +740,7 @@ update_source_label(signal_user_data_t *ud, const gchar *source)
 G_MODULE_EXPORT void
 chooser_file_selected_cb(GtkFileChooser *dialog, signal_user_data_t *ud)
 {
-	const gchar *name = gtk_file_chooser_get_filename (dialog);
+	gchar *name = gtk_file_chooser_get_filename (dialog);
 	GtkTreeModel *store;
 	GtkTreeIter iter;
 	const gchar *device;
@@ -637,6 +766,8 @@ chooser_file_selected_cb(GtkFileChooser *dialog, signal_user_data_t *ud)
 		gtk_combo_box_set_active_iter (combo, &iter);
 	else
 		gtk_combo_box_set_active (combo, 0);
+
+	g_free(name);
 }
 
 G_MODULE_EXPORT void
@@ -648,13 +779,16 @@ dvd_device_changed_cb(GtkComboBox *combo, signal_user_data_t *ud)
 	ii = gtk_combo_box_get_active (combo);
 	if (ii > 0)
 	{
-		const gchar *device, *name;
+		const gchar *device;
+		gchar *name;
 
 		dialog = GHB_WIDGET(ud->builder, "source_dialog");
 		device = gtk_combo_box_get_active_text (combo);
 		name = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(dialog));
 		if (name == NULL || strcmp(name, device) != 0)
 			gtk_file_chooser_select_filename (GTK_FILE_CHOOSER(dialog), device);
+		if (name != NULL)
+			g_free(name);
 	}
 }
 
@@ -709,10 +843,10 @@ source_dialog_extra_widgets(
 	gtk_combo_box_append_text (combo, "Not Selected");
 	while (link != NULL)
 	{
-		gchar *name = get_dvd_volume_name(link->data);
+		gchar *name = get_dvd_device_name(link->data);
 		gtk_combo_box_append_text(combo, name);
 		g_free(name);
-		g_object_unref(link->data);
+		free_drive(link->data);
 		link = link->next;
 	}
 	g_list_free(drives);
@@ -721,6 +855,44 @@ source_dialog_extra_widgets(
 extern GValue *ghb_queue_edit_settings;
 static gchar *last_scan_file = NULL;
 
+static void 
+show_scan_progress(signal_user_data_t *ud)
+{
+	GtkProgressBar *progress;
+	GtkLabel *label;
+
+	progress = GTK_PROGRESS_BAR(GHB_WIDGET(ud->builder, "scan_prog"));
+	gtk_progress_bar_set_fraction (progress, 0);
+	gtk_widget_show(GTK_WIDGET(progress));
+
+	label = GTK_LABEL(GHB_WIDGET(ud->builder, "source_title"));
+	gtk_label_set_text( label, "Scanning ..." );
+}
+
+static void
+start_scan(
+	signal_user_data_t *ud, 
+	const gchar *path, 
+	gint titlenum, 
+	gint preview_count)
+{
+	GtkWidget *widget;
+	GtkAction *action;
+	ghb_status_t status;
+
+	ghb_get_status(&status);
+	if (status.scan.state != GHB_STATE_IDLE)
+		return;
+
+	widget = GHB_WIDGET(ud->builder, "sourcetoolbutton");
+	gtk_widget_set_sensitive(widget, FALSE);
+	action = GHB_ACTION(ud->builder, "source_action");
+	gtk_action_set_sensitive(action, FALSE);
+	action = GHB_ACTION(ud->builder, "source_single_action");
+	gtk_action_set_sensitive(action, FALSE);
+	ghb_backend_scan(path, titlenum, preview_count);
+}
+
 void
 ghb_do_scan(
 	signal_user_data_t *ud, 
@@ -728,6 +900,7 @@ ghb_do_scan(
 	gint titlenum, 
 	gboolean force)
 {
+	g_debug("ghb_do_scan()");
 	if (!force && last_scan_file != NULL &&
 		strcmp(last_scan_file, filename) == 0)
 	{
@@ -738,6 +911,7 @@ ghb_do_scan(
 			jstatus = ghb_settings_get_int(ghb_queue_edit_settings, "job_status");
 			ghb_settings_to_ui(ud, ghb_queue_edit_settings);
 			ghb_set_audio(ud, ghb_queue_edit_settings);
+			ghb_reset_subtitles(ud, ghb_queue_edit_settings);
 			if (jstatus == GHB_QUEUE_PENDING)
 			{
 				ghb_value_free(ghb_queue_edit_settings);
@@ -753,18 +927,17 @@ ghb_do_scan(
 	{
 		last_scan_file = g_strdup(filename);
 		ghb_settings_set_string(ud->settings, "source", filename);
-		if (update_source_label(ud, filename))
+		if (update_source_label(ud, filename, TRUE))
 		{
-			GtkProgressBar *progress;
-			progress = GTK_PROGRESS_BAR(GHB_WIDGET(ud->builder, "progressbar"));
 			gchar *path;
+			gint preview_count;
+
+			show_scan_progress(ud);
 			path = ghb_settings_get_string( ud->settings, "source");
-			gtk_progress_bar_set_fraction (progress, 0);
-			gtk_progress_bar_set_text (progress, "Scanning ...");
 			prune_logs(ud);
-			gint preview_count;
+
 			preview_count = ghb_settings_get_int(ud->settings, "preview_count");
-			ghb_backend_scan(path, titlenum, preview_count);
+			start_scan(ud, path, titlenum, preview_count);
 			g_free(path);
 		}
 		else
@@ -827,7 +1000,7 @@ do_source_dialog(GtkButton *button, gboolean single, signal_user_data_t *ud)
 	gtk_widget_hide(dialog);
 	if (response == GTK_RESPONSE_ACCEPT)
 	{
-		char *filename;
+		gchar *filename;
 
 		filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
 		if (filename != NULL)
@@ -882,17 +1055,24 @@ dvd_source_activate_cb(GtkAction *action, signal_user_data_t *ud)
 	g_free(sourcename);
 }
 
-static void
-update_destination_extension(signal_user_data_t *ud)
+void
+ghb_update_destination_extension(signal_user_data_t *ud)
 {
-	static gchar *containers[] = {".mkv", ".mp4", ".m4v", ".avi", ".ogm", NULL};
+	static gchar *containers[] = {".mkv", ".mp4", ".m4v", NULL};
 	gchar *filename;
-	gchar *extension;
+	const gchar *extension;
 	gint ii;
 	GtkEntry *entry;
+	static gboolean busy = FALSE;
 
-	g_debug("update_destination_extension ()");
-	extension = ghb_settings_get_string(ud->settings, "FileFormat");
+	g_debug("ghb_update_destination_extension ()");
+	// Since this function modifies the thing that triggers it's
+	// invocation, check to see if busy to prevent accidental infinite
+	// recursion.
+	if (busy)
+		return;
+	busy = TRUE;
+	extension = get_extension(ud);
 	entry = GTK_ENTRY(GHB_WIDGET(ud->builder, "dest_file"));
 	filename = g_strdup(gtk_entry_get_text(entry));
 	for (ii = 0; containers[ii] != NULL; ii++)
@@ -920,8 +1100,8 @@ update_destination_extension(signal_user_data_t *ud)
 			break;
 		}
 	}
-	g_free(extension);
 	g_free(filename);
+	busy = FALSE;
 }
 
 static void
@@ -987,7 +1167,7 @@ dest_file_changed_cb(GtkEntry *entry, signal_user_data_t *ud)
 	gchar *dest_file, *dest_dir, *dest;
 	
 	g_debug("dest_file_changed_cb ()");
-	update_destination_extension(ud);
+	ghb_update_destination_extension(ud);
 	ghb_widget_to_setting(ud->settings, (GtkWidget*)entry);
 	// This signal goes off with ever keystroke, so I'm putting this
 	// update on the timer.
@@ -1058,7 +1238,7 @@ window_delete_event_cb(GtkWidget *widget, GdkEvent *event, signal_user_data_t *u
 	g_debug("window_delete_event_cb ()");
 	if (state & GHB_STATE_WORKING)
 	{
-		if (ghb_cancel_encode("Closing HandBrake will terminate encoding.\n"))
+		if (ghb_cancel_encode2(ud, "Closing HandBrake will terminate encoding.\n"))
 		{
 			ghb_hb_cleanup(FALSE);
 			prune_logs(ud);
@@ -1082,27 +1262,14 @@ update_acodec_combo(signal_user_data_t *ud)
 G_MODULE_EXPORT void
 container_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	const GValue *audio_list;
 	g_debug("container_changed_cb ()");
 	ghb_widget_to_setting(ud->settings, widget);
-	update_destination_extension(ud);
 	ghb_check_dependency(ud, widget);
 	update_acodec_combo(ud);
+	ghb_update_destination_extension(ud);
 	ghb_clear_presets_selection(ud);
 	ghb_live_reset(ud);
-
-	audio_list = ghb_settings_get_value(ud->settings, "audio_list");
-	if (ghb_ac3_in_audio_list (audio_list))
-	{
-		gchar *container;
-
-		container = ghb_settings_get_string(ud->settings, "FileFormat");
-		if (strcmp(container, "mp4") == 0)
-		{
-			ghb_ui_update(ud, "FileFormat", ghb_string_value("m4v"));
-		}
-		g_free(container);
-	}
+	ghb_subtitle_prune(ud);
 }
 
 static gchar*
@@ -1219,6 +1386,10 @@ show_title_info(signal_user_data_t *ud, ghb_title_info_t *tinfo)
 	widget = GHB_WIDGET (ud->builder, "start_chapter");
 	gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 1);
 	gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, tinfo->num_chapters);
+
+	widget = GHB_WIDGET (ud->builder, "angle");
+	gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 1);
+	gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, tinfo->angle_count);
 	ud->dont_clear_presets = FALSE;
 }
 
@@ -1235,10 +1406,9 @@ title_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 	ghb_check_dependency(ud, widget);
 
 	titleindex = ghb_settings_combo_int(ud->settings, "title");
-	ghb_update_ui_combo_box (ud->builder, "AudioTrack", titleindex, FALSE);
-	ghb_update_ui_combo_box (ud->builder, "Subtitles", titleindex, FALSE);
+	ghb_update_ui_combo_box (ud, "AudioTrack", titleindex, FALSE);
+	ghb_update_ui_combo_box (ud, "SubtitleTrack", titleindex, FALSE);
 
-	ghb_update_from_preset(ud, "Subtitles");
 	if (ghb_get_title_info (&tinfo, titleindex))
 	{
 		show_title_info(ud, &tinfo);
@@ -1246,6 +1416,7 @@ title_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 	update_chapter_list (ud);
 	ghb_adjust_audio_rate_combos(ud);
 	ghb_set_pref_audio(titleindex, ud);
+	ghb_set_pref_subtitle(titleindex, ud);
 	if (ghb_settings_get_boolean(ud->settings, "vquality_type_target"))
 	{
 		gint bitrate = ghb_calculate_target_bitrate (ud->settings, titleindex);
@@ -1280,6 +1451,16 @@ setting_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 }
 
 G_MODULE_EXPORT void
+chapter_markers_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+	ghb_widget_to_setting(ud->settings, widget);
+	ghb_check_dependency(ud, widget);
+	ghb_clear_presets_selection(ud);
+	ghb_live_reset(ud);
+	ghb_update_destination_extension(ud);
+}
+
+G_MODULE_EXPORT void
 vquality_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
 	ghb_widget_to_setting(ud->settings, widget);
@@ -1368,6 +1549,17 @@ start_chapter_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 	{
 		set_destination(ud);
 	}
+	widget = GHB_WIDGET (ud->builder, "chapters_tab");
+	// End may have been changed above, get it again
+	end = ghb_settings_get_int(ud->settings, "end_chapter");
+	if (start == end)
+	{
+		gtk_widget_hide(widget);
+	}
+	else
+	{
+		gtk_widget_show(widget);
+	}
 }
 
 G_MODULE_EXPORT void
@@ -1387,6 +1579,17 @@ end_chapter_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 	{
 		set_destination(ud);
 	}
+	widget = GHB_WIDGET (ud->builder, "chapters_tab");
+	// Start may have been changed above, get it again
+	start = ghb_settings_get_int(ud->settings, "start_chapter");
+	if (start == end)
+	{
+		gtk_widget_hide(widget);
+	}
+	else
+	{
+		gtk_widget_show(widget);
+	}
 }
 
 G_MODULE_EXPORT void
@@ -1473,7 +1676,7 @@ crop_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 G_MODULE_EXPORT void
 display_width_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	g_debug("scale_changed_cb ()");
+	g_debug("display_width_changed_cb ()");
 	ghb_widget_to_setting(ud->settings, widget);
 	ghb_check_dependency(ud, widget);
 	ghb_clear_presets_selection(ud);
@@ -1481,25 +1684,13 @@ display_width_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 	if (GTK_WIDGET_SENSITIVE(widget))
 		ghb_set_scale (ud, GHB_PIC_KEEP_DISPLAY_WIDTH);
 
-	gint pic_par;
-
-	pic_par = ghb_settings_combo_int(ud->settings, "PicturePAR");
-	if (pic_par == 3)
-	{
-		gint par_width, par_height;
-
-		par_width = ghb_settings_get_int(ud->settings, "par_width");
-		par_height = ghb_settings_get_int(ud->settings, "par_height");
-		ghb_settings_set_int(ud->settings, "PicturePARWidth", par_width);
-		ghb_settings_set_int(ud->settings, "PicturePARHeight", par_height);
-	}
 	update_preview = TRUE;
 }
 
-void
+G_MODULE_EXPORT void
 display_height_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-	g_debug("scale_changed_cb ()");
+	g_debug("display_height_changed_cb ()");
 	ghb_widget_to_setting(ud->settings, widget);
 	ghb_check_dependency(ud, widget);
 	ghb_clear_presets_selection(ud);
@@ -1507,22 +1698,24 @@ display_height_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 	if (GTK_WIDGET_SENSITIVE(widget))
 		ghb_set_scale (ud, GHB_PIC_KEEP_DISPLAY_HEIGHT);
 
-	gint pic_par;
+	update_preview = TRUE;
+}
 
-	pic_par = ghb_settings_combo_int(ud->settings, "PicturePAR");
-	if (pic_par == 3)
-	{
-		gint par_width, par_height;
+G_MODULE_EXPORT void
+par_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+	g_debug("par_changed_cb ()");
+	ghb_widget_to_setting(ud->settings, widget);
+	ghb_check_dependency(ud, widget);
+	ghb_clear_presets_selection(ud);
+	ghb_live_reset(ud);
+	if (GTK_WIDGET_SENSITIVE(widget))
+		ghb_set_scale (ud, GHB_PIC_KEEP_PAR);
 
-		par_width = ghb_settings_get_int(ud->settings, "par_width");
-		par_height = ghb_settings_get_int(ud->settings, "par_height");
-		ghb_settings_set_int(ud->settings, "PicturePARWidth", par_width);
-		ghb_settings_set_int(ud->settings, "PicturePARHeight", par_height);
-	}
 	update_preview = TRUE;
 }
 
-void
+G_MODULE_EXPORT void
 scale_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
 	g_debug("scale_changed_cb ()");
@@ -1565,6 +1758,18 @@ scale_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 }
 
 G_MODULE_EXPORT void
+show_crop_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+	g_debug("show_crop_changed_cb ()");
+	ghb_widget_to_setting(ud->settings, widget);
+	ghb_check_dependency(ud, widget);
+	ghb_live_reset(ud);
+	if (GTK_WIDGET_SENSITIVE(widget))
+		ghb_set_scale (ud, 0);
+	update_preview = TRUE;
+}
+
+G_MODULE_EXPORT void
 generic_entry_changed_cb(GtkEntry *entry, signal_user_data_t *ud)
 {
 	// Normally (due to user input) I only want to process the entry
@@ -1593,6 +1798,95 @@ prefs_dialog_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 	gtk_widget_hide(dialog);
 }
 
+typedef struct
+{
+	GtkMessageDialog *dlg;
+	const gchar *msg;
+	const gchar *action;
+	gint timeout;
+} countdown_t;
+
+static gboolean
+shutdown_cb(countdown_t *cd)
+{
+	gchar *str;
+
+	cd->timeout--;
+	if (cd->timeout == 0)
+	{
+		ghb_shutdown_gpm();
+		gtk_main_quit();
+		return FALSE;
+	}
+	str = g_strdup_printf("%s\n\n%s in %d seconds ...", 
+							cd->msg, cd->action, cd->timeout);
+	gtk_message_dialog_set_markup(cd->dlg, str);
+	g_free(str);
+	return TRUE;
+}
+
+static gboolean
+suspend_cb(countdown_t *cd)
+{
+	gchar *str;
+
+	cd->timeout--;
+	if (cd->timeout == 0)
+	{
+		gtk_widget_destroy (GTK_WIDGET(cd->dlg));
+		ghb_suspend_gpm();
+		return FALSE;
+	}
+	str = g_strdup_printf("%s\n\n%s in %d seconds ...", 
+							cd->msg, cd->action, cd->timeout);
+	gtk_message_dialog_set_markup(cd->dlg, str);
+	g_free(str);
+	return TRUE;
+}
+
+void
+ghb_countdown_dialog(
+	GtkMessageType type, 
+	const gchar *message, 
+	const gchar *action, 
+	const gchar *cancel, 
+	GSourceFunc action_func,
+	gint timeout)
+{
+	GtkWidget *dialog;
+	GtkResponseType response;
+	guint timeout_id;
+	countdown_t cd;
+			
+	cd.msg = message;
+	cd.action = action;
+	cd.timeout = timeout;
+
+	// Toss up a warning dialog
+	dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
+							type, GTK_BUTTONS_NONE,
+							"%s\n\n%s in %d seconds ...", 
+							message, action, timeout);
+	gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
+						   cancel, GTK_RESPONSE_CANCEL,
+						   NULL);
+
+	cd.dlg = GTK_MESSAGE_DIALOG(dialog);
+	timeout_id = g_timeout_add(1000, action_func, &cd);
+	response = gtk_dialog_run(GTK_DIALOG(dialog));
+	gtk_widget_destroy (dialog);
+	if (response == GTK_RESPONSE_CANCEL)
+	{
+		GMainContext *mc;
+		GSource *source;
+
+		mc = g_main_context_default();
+		source = g_main_context_find_source_by_id(mc, timeout_id);
+		if (source != NULL)
+			g_source_destroy(source);
+	}
+}
+
 gboolean
 ghb_message_dialog(GtkMessageType type, const gchar *message, const gchar *no, const gchar *yes)
 {
@@ -1615,8 +1909,64 @@ ghb_message_dialog(GtkMessageType type, const gchar *message, const gchar *no, c
 	return TRUE;
 }
 
+void
+ghb_error_dialog(GtkMessageType type, const gchar *message, const gchar *cancel)
+{
+	GtkWidget *dialog;
+	GtkResponseType response;
+			
+	// Toss up a warning dialog
+	dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
+							type, GTK_BUTTONS_NONE,
+							"%s", message);
+	gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
+						   cancel, GTK_RESPONSE_CANCEL, NULL);
+	response = gtk_dialog_run(GTK_DIALOG(dialog));
+	gtk_widget_destroy (dialog);
+}
+
+void
+ghb_cancel_encode(signal_user_data_t *ud, const gchar *extra_msg)
+{
+	GtkWidget *dialog;
+	GtkResponseType response;
+	
+	if (extra_msg == NULL) extra_msg = "";
+	// Toss up a warning dialog
+	dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
+				GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
+				"%sYour movie will be lost if you don't continue encoding.",
+				extra_msg);
+	gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
+						   "Cancel Current and Stop", 1,
+						   "Cancel Current, Start Next", 2,
+						   "Finish Current, then Stop", 3,
+						   "Continue Encoding", 4,
+						   NULL);
+	response = gtk_dialog_run(GTK_DIALOG(dialog));
+	gtk_widget_destroy (dialog);
+	switch (response)
+	{
+		case 1:
+			ghb_stop_queue();
+			ud->cancel_encode = GHB_CANCEL_ALL;
+			break;
+		case 2:
+			ghb_stop_queue();
+			ud->cancel_encode = GHB_CANCEL_CURRENT;
+			break;
+		case 3:
+			ud->cancel_encode = GHB_CANCEL_FINISH;
+			break;
+		case 4:
+		default:
+			ud->cancel_encode = GHB_CANCEL_NONE;
+			break;
+	}
+}
+
 gboolean
-ghb_cancel_encode(const gchar *extra_msg)
+ghb_cancel_encode2(signal_user_data_t *ud, const gchar *extra_msg)
 {
 	GtkWidget *dialog;
 	GtkResponseType response;
@@ -1628,13 +1978,22 @@ ghb_cancel_encode(const gchar *extra_msg)
 				"%sYour movie will be lost if you don't continue encoding.",
 				extra_msg);
 	gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
-						   "Continue Encoding", GTK_RESPONSE_NO,
-						   "Stop Encoding", GTK_RESPONSE_YES, NULL);
+						   "Cancel Current and Stop", 1,
+						   "Continue Encoding", 4,
+						   NULL);
 	response = gtk_dialog_run(GTK_DIALOG(dialog));
 	gtk_widget_destroy (dialog);
-	if (response == GTK_RESPONSE_NO) return FALSE;
-	ghb_stop_queue();
-	return TRUE;
+	switch (response)
+	{
+		case 1:
+			ghb_stop_queue();
+			ud->cancel_encode = GHB_CANCEL_ALL;
+			return TRUE;
+		case 4:
+		default:
+			break;
+	}
+	return FALSE;
 }
 
 static void
@@ -1666,13 +2025,19 @@ static void
 prune_logs(signal_user_data_t *ud)
 {
 	gchar *dest_dir;
+	gint days;
 
 	// Only prune logs stored in the default config dir location
+	days = ghb_settings_combo_int(ud->settings, "LogLongevity");
+	if (days > 365)
+		return;
+
 	dest_dir = ghb_get_user_config_dir("EncodeLogs");
 	if (g_file_test(dest_dir, G_FILE_TEST_IS_DIR))
 	{
 		const gchar *file;
-		int week = 7*24*60*60;
+		gint duration = days * 24 * 60 * 60;
+		
 		GDir *gdir = g_dir_open(dest_dir, 0, NULL);
 		time_t now;
 
@@ -1685,7 +2050,7 @@ prune_logs(signal_user_data_t *ud)
 
 			path = g_strdup_printf("%s/%s", dest_dir, file);
 			g_stat(path, &stbuf);
-			if (now - stbuf.st_mtime > week)
+			if (now - stbuf.st_mtime > duration)
 			{
 				g_unlink(path);
 			}
@@ -1725,10 +2090,11 @@ queue_scan(signal_user_data_t *ud, GValue *js)
 	{
 		*pos = 0;
 	}
-	log_path = g_strdup_printf("%s/%d-%02d-%02d %02d-%02d-%02d %s.log",
+	log_path = g_strdup_printf("%s/%s %d-%02d-%02d %02d-%02d-%02d.log",
 		dest_dir,
+		basename,
 		now->tm_year + 1900, now->tm_mon + 1, now->tm_mday,
-		now->tm_hour, now->tm_min, now->tm_sec, basename);
+		now->tm_hour, now->tm_min, now->tm_sec);
 	g_free(basename);
 	g_free(dest_dir);
 	if (ud->job_activity_log)
@@ -1752,6 +2118,42 @@ queue_scan(signal_user_data_t *ud, GValue *js)
 	g_free(path);
 }
 
+static gint
+queue_pending_count(GValue *queue)
+{
+	gint nn, ii, count;
+	GValue *js;
+	gint status;
+
+	nn = 0;
+	count = ghb_array_len(queue);
+	for (ii = 0; ii < count; ii++)
+	{
+
+		js = ghb_array_get_nth(queue, ii);
+		status = ghb_settings_get_int(js, "job_status");
+		if (status == GHB_QUEUE_PENDING)
+		{
+			nn++;
+		}
+	}
+	return nn;
+}
+
+void
+ghb_update_pending(signal_user_data_t *ud)
+{
+	GtkLabel *label;
+	gint pending;
+	gchar *str;
+
+	label = GTK_LABEL(GHB_WIDGET(ud->builder, "pending_status"));
+	pending = queue_pending_count(ud->queue);
+	str = g_strdup_printf("%d encode(s) pending", pending);
+	gtk_label_set_text(label, str);
+	g_free(str);
+}
+
 GValue* 
 ghb_start_next_job(signal_user_data_t *ud, gboolean find_first)
 {
@@ -1759,8 +2161,12 @@ ghb_start_next_job(signal_user_data_t *ud, gboolean find_first)
 	gint count, ii, jj;
 	GValue *js;
 	gint status;
+	GtkWidget *prog;
 
 	g_debug("start_next_job");
+	prog = GHB_WIDGET(ud->builder, "progressbar");
+	gtk_widget_show(prog);
+
 	count = ghb_array_len(ud->queue);
 	if (find_first)
 	{	// Start the first pending item in the queue
@@ -1775,6 +2181,7 @@ ghb_start_next_job(signal_user_data_t *ud, gboolean find_first)
 				current = ii;
 				ghb_inhibit_gpm();
 				queue_scan(ud, js);
+				ghb_update_pending(ud);
 				return js;
 			}
 		}
@@ -1799,6 +2206,7 @@ ghb_start_next_job(signal_user_data_t *ud, gboolean find_first)
 					current = jj;
 					ghb_inhibit_gpm();
 					queue_scan(ud, js);
+					ghb_update_pending(ud);
 					return js;
 				}
 			}
@@ -1815,12 +2223,15 @@ ghb_start_next_job(signal_user_data_t *ud, gboolean find_first)
 			current = ii;
 			ghb_inhibit_gpm();
 			queue_scan(ud, js);
+			ghb_update_pending(ud);
 			return js;
 		}
 	}
 	// Nothing found
 	ghb_uninhibit_gpm();
 	ghb_notify_done(ud);
+	ghb_update_pending(ud);
+	gtk_widget_hide(prog);
 	return NULL;
 }
 
@@ -1833,6 +2244,9 @@ find_queue_job(GValue *queue, gint unique_id, GValue **job)
 	
 	*job = NULL;
 	g_debug("find_queue_job");
+	if (unique_id == 0)  // Invalid Id
+		return -1;
+
 	count = ghb_array_len(queue);
 	for (ii = 0; ii < count; ii++)
 	{
@@ -1854,26 +2268,39 @@ working_status_string(signal_user_data_t *ud, ghb_instance_status_t *status)
 	gint qcount;
 	gint index;
 	GValue *js;
+	gboolean subtitle_scan = FALSE;
 
-	if (status->job_count > 1)
-	{
-		task_str = g_strdup_printf("pass %d of %d, ", 
-			status->job_cur, status->job_count);
-	}
-	else
+	qcount = ghb_array_len(ud->queue);
+	index = find_queue_job(ud->queue, status->unique_id, &js);
+	if (js != NULL)
 	{
-		task_str = g_strdup("");
+		subtitle_scan = ghb_settings_get_boolean(js, "subtitle_scan");
 	}
-	qcount = ghb_array_len(ud->queue);
 	if (qcount > 1)
 	{
-		index = find_queue_job(ud->queue, status->unique_id, &js);
 		job_str = g_strdup_printf("job %d of %d, ", index+1, qcount);
 	}
 	else
 	{
 		job_str = g_strdup("");
 	}
+	if (status->job_count > 1)
+	{
+		if (status->job_cur == 1 && subtitle_scan)
+		{
+			task_str = g_strdup_printf("pass %d (subtitle scan) of %d, ", 
+				status->job_cur, status->job_count);
+		}
+		else
+		{
+			task_str = g_strdup_printf("pass %d of %d, ", 
+				status->job_cur, status->job_count);
+		}
+	}
+	else
+	{
+		task_str = g_strdup("");
+	}
 	if(status->seconds > -1)
 	{
 		status_str= g_strdup_printf(
@@ -1902,22 +2329,48 @@ ghb_backend_events(signal_user_data_t *ud)
 	ghb_status_t status;
 	gchar *status_str;
 	GtkProgressBar *progress;
+	GtkLabel       *work_status;
 	gint titleindex;
 	GValue *js;
 	gint index;
 	GtkTreeView *treeview;
 	GtkTreeStore *store;
 	GtkTreeIter iter;
-	static gint working = 0;
-	static gboolean work_started = FALSE;
+	static gint prev_scan_state = 0;
+	static gint prev_queue_state = 0;
 	
 	ghb_track_status();
 	ghb_get_status(&status);
+	if (prev_scan_state != status.scan.state ||
+		prev_queue_state != status.queue.state)
+	{
+		ghb_queue_buttons_grey(ud);
+		prev_scan_state = status.scan.state;
+		prev_queue_state = status.queue.state;
+	}
 	progress = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "progressbar"));
+	work_status = GTK_LABEL(GHB_WIDGET (ud->builder, "work_status"));
+	if (status.scan.state == GHB_STATE_IDLE && 
+		status.queue.state == GHB_STATE_IDLE)
+	{
+		static gboolean prev_dvdnav;
+		gboolean dvdnav = ghb_settings_get_boolean(ud->settings, "use_dvdnav");
+		if (dvdnav != prev_dvdnav)
+		{
+			hb_dvd_set_dvdnav(dvdnav);
+			prev_dvdnav = dvdnav;
+		}
+	}
 	// First handle the status of title scans
 	// Then handle the status of the queue
 	if (status.scan.state & GHB_STATE_SCANNING)
 	{
+		GtkProgressBar *scan_prog;
+		GtkLabel *label;
+
+		scan_prog = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "scan_prog"));
+		label = GTK_LABEL(GHB_WIDGET (ud->builder, "source_title"));
+
 		if (status.scan.title_cur == 0)
 		{
 			status_str = g_strdup ("Scanning...");
@@ -1927,37 +2380,50 @@ ghb_backend_events(signal_user_data_t *ud)
 			status_str = g_strdup_printf ("Scanning title %d of %d...", 
 							  status.scan.title_cur, status.scan.title_count );
 		}
-		gtk_progress_bar_set_text (progress, status_str);
+		gtk_label_set_text (label, status_str);
 		g_free(status_str);
 		if (status.scan.title_count > 0)
 		{
-			gtk_progress_bar_set_fraction (progress, 
+			gtk_progress_bar_set_fraction (scan_prog, 
 				(gdouble)status.scan.title_cur / status.scan.title_count);
 		}
 	}
 	else if (status.scan.state & GHB_STATE_SCANDONE)
 	{
-		status_str = g_strdup_printf ("Scan done"); 
-		gtk_progress_bar_set_text (progress, status_str);
-		g_free(status_str);
-		gtk_progress_bar_set_fraction (progress, 1.0);
+		gchar *source;
+		GtkProgressBar *scan_prog;
+		GtkLabel *label;
+
+		GtkWidget *widget;
+		GtkAction *action;
+
+		widget = GHB_WIDGET(ud->builder, "sourcetoolbutton");
+		gtk_widget_set_sensitive(widget, TRUE);
+		action = GHB_ACTION(ud->builder, "source_action");
+		gtk_action_set_sensitive(action, TRUE);
+		action = GHB_ACTION(ud->builder, "source_single_action");
+		gtk_action_set_sensitive(action, TRUE);
+
+		source = ghb_settings_get_string(ud->settings, "source");
+		update_source_label(ud, source, FALSE);
+
+		scan_prog = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "scan_prog"));
+		gtk_progress_bar_set_fraction (scan_prog, 1.0);
+		gtk_widget_hide(GTK_WIDGET(scan_prog));
 
 		ghb_title_info_t tinfo;
 			
-		ghb_update_ui_combo_box(ud->builder, "title", 0, FALSE);
+		ghb_update_ui_combo_box(ud, "title", 0, FALSE);
 		titleindex = ghb_longest_title();
 		ghb_ui_update(ud, "title", ghb_int64_value(titleindex));
 
+		label = GTK_LABEL(GHB_WIDGET (ud->builder, "source_title"));
 		// Are there really any titles.
 		if (!ghb_get_title_info(&tinfo, titleindex))
 		{
-			GtkProgressBar *progress;
-			progress = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "progressbar"));
-			gtk_progress_bar_set_fraction (progress, 0);
-			gtk_progress_bar_set_text (progress, "No Source");
+			gtk_label_set_text(label, "None");
 		}
 		ghb_clear_scan_state(GHB_STATE_SCANDONE);
-		ghb_queue_buttons_grey(ud, work_started);
 		if (ghb_queue_edit_settings)
 		{
 			gint jstatus;
@@ -1965,6 +2431,7 @@ ghb_backend_events(signal_user_data_t *ud)
 			jstatus = ghb_settings_get_int(ghb_queue_edit_settings, "job_status");
 			ghb_settings_to_ui(ud, ghb_queue_edit_settings);
 			ghb_set_audio(ud, ghb_queue_edit_settings);
+			ghb_reset_subtitles(ud, ghb_queue_edit_settings);
 			if (jstatus == GHB_QUEUE_PENDING)
 			{
 				ghb_value_free(ghb_queue_edit_settings);
@@ -1972,11 +2439,12 @@ ghb_backend_events(signal_user_data_t *ud)
 			ghb_queue_edit_settings = NULL;
 		}
 	}
-	else if (status.queue.state & GHB_STATE_SCANNING)
+
+	if (status.queue.state & GHB_STATE_SCANNING)
 	{
-		status_str = g_strdup_printf ("Scanning ...");
-		gtk_progress_bar_set_text (progress, status_str);
-		g_free(status_str);
+		// This needs to be in scanning and working since scanning
+		// happens fast enough that it can be missed
+		gtk_label_set_text (work_status, "Scanning ...");
 		gtk_progress_bar_set_fraction (progress, 0);
 	}
 	else if (status.queue.state & GHB_STATE_SCANDONE)
@@ -1984,17 +2452,47 @@ ghb_backend_events(signal_user_data_t *ud)
 		ghb_clear_queue_state(GHB_STATE_SCANDONE);
 		usleep(2000000);
 		submit_job(ud->current_job);
+		ghb_update_pending(ud);
 	}
 	else if (status.queue.state & GHB_STATE_PAUSED)
 	{
-		status_str = g_strdup_printf ("Paused"); 
-		gtk_progress_bar_set_text (progress, status_str);
-		g_free(status_str);
+		gtk_label_set_text (work_status, "Paused");
 	}
 	else if (status.queue.state & GHB_STATE_WORKING)
 	{
+		static gint working = 0;
+
+		// This needs to be in scanning and working since scanning
+		// happens fast enough that it can be missed
+		index = find_queue_job(ud->queue, status.queue.unique_id, &js);
+		if (status.queue.unique_id != 0 && index >= 0)
+		{
+			gchar working_icon[] = "hb-working0";
+			working_icon[10] = '0' + working;
+			working = (working+1) % 6;
+			treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
+			store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
+			gchar *path = g_strdup_printf ("%d", index);
+			if (gtk_tree_model_get_iter_from_string(
+					GTK_TREE_MODEL(store), &iter, path))
+			{
+				gtk_tree_store_set(store, &iter, 0, working_icon, -1);
+			}
+			g_free(path);
+		}
+		GtkLabel *label;
+		gchar *status_str;
+
 		status_str = working_status_string(ud, &status.queue);
-		gtk_progress_bar_set_text (progress, status_str);
+		label = GTK_LABEL(GHB_WIDGET(ud->builder, "queue_status"));
+		gtk_label_set_text (label, status_str);
+#if !GTK_CHECK_VERSION(2, 16, 0)
+		GtkStatusIcon *si;
+
+		si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
+		gtk_status_icon_set_tooltip(si, status_str);
+#endif
+		gtk_label_set_text (work_status, status_str);
 		gtk_progress_bar_set_fraction (progress, status.queue.progress);
 		g_free(status_str);
 	}
@@ -2002,17 +2500,16 @@ ghb_backend_events(signal_user_data_t *ud)
 	{
 		gint qstatus;
 
-		work_started = FALSE;
-		ghb_queue_buttons_grey(ud, FALSE);
 		index = find_queue_job(ud->queue, status.queue.unique_id, &js);
 		treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
 		store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
-		if (ud->cancel_encode)
+		if (ud->cancel_encode == GHB_CANCEL_ALL || 
+			ud->cancel_encode == GHB_CANCEL_CURRENT)
 			status.queue.error = GHB_ERROR_CANCELED;
 		switch( status.queue.error )
 		{
 			case GHB_ERROR_NONE:
-				gtk_progress_bar_set_text( progress, "Rip done!" );
+				gtk_label_set_text (work_status, "Rip Done!");
 				qstatus = GHB_QUEUE_DONE;
 				if (js != NULL)
 				{
@@ -2026,7 +2523,7 @@ ghb_backend_events(signal_user_data_t *ud)
 				}
 				break;
 			case GHB_ERROR_CANCELED:
-				gtk_progress_bar_set_text( progress, "Rip canceled." );
+				gtk_label_set_text (work_status, "Rip Canceled.");
 				qstatus = GHB_QUEUE_CANCELED;
 				if (js != NULL)
 				{
@@ -2040,7 +2537,7 @@ ghb_backend_events(signal_user_data_t *ud)
 				}
 				break;
 			default:
-				gtk_progress_bar_set_text( progress, "Rip failed.");
+				gtk_label_set_text (work_status, "Rip Failed.");
 				qstatus = GHB_QUEUE_CANCELED;
 				if (js != NULL)
 				{
@@ -2058,7 +2555,8 @@ ghb_backend_events(signal_user_data_t *ud)
 		if (ud->job_activity_log)
 			g_io_channel_unref(ud->job_activity_log);
 		ud->job_activity_log = NULL;
-		if (!ud->cancel_encode)
+		if (ud->cancel_encode != GHB_CANCEL_ALL &&
+			ud->cancel_encode != GHB_CANCEL_FINISH)
 		{
 			ud->current_job = ghb_start_next_job(ud, FALSE);
 		}
@@ -2066,59 +2564,24 @@ ghb_backend_events(signal_user_data_t *ud)
 		{
 			ghb_uninhibit_gpm();
 			ud->current_job = NULL;
+			gtk_widget_hide(GTK_WIDGET(progress));
 		}
 		if (js)
 			ghb_settings_set_int(js, "job_status", qstatus);
 		ghb_save_queue(ud->queue);
-		ud->cancel_encode = FALSE;
+		ud->cancel_encode = GHB_CANCEL_NONE;
+#if !GTK_CHECK_VERSION(2, 16, 0)
+		GtkStatusIcon *si;
+
+		si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
+		gtk_status_icon_set_tooltip(si, "HandBrake");
+#endif
 	}
 	else if (status.queue.state & GHB_STATE_MUXING)
 	{
-		gtk_progress_bar_set_text(progress, "Muxing: this may take awhile...");
-	}
-	if (status.queue.state & GHB_STATE_SCANNING)
-	{
-		// This needs to be in scanning and working since scanning
-		// happens fast enough that it can be missed
-		if (!work_started)
-		{
-			work_started = TRUE;
-			ghb_queue_buttons_grey(ud, TRUE);
-		}
+		gtk_label_set_text (work_status, "Muxing: This may take a while...");
 	}
-	if (status.queue.state & GHB_STATE_WORKING)
-	{
-		// This needs to be in scanning and working since scanning
-		// happens fast enough that it can be missed
-		if (!work_started)
-		{
-			work_started = TRUE;
-			ghb_queue_buttons_grey(ud, TRUE);
-		}
-		index = find_queue_job(ud->queue, status.queue.unique_id, &js);
-		if (status.queue.unique_id != 0 && index >= 0)
-		{
-			gchar working_icon[] = "hb-working0";
-			working_icon[10] = '0' + working;
-			working = (working+1) % 6;
-			treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
-			store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
-			gchar *path = g_strdup_printf ("%d", index);
-			if (gtk_tree_model_get_iter_from_string(
-					GTK_TREE_MODEL(store), &iter, path))
-			{
-				gtk_tree_store_set(store, &iter, 0, working_icon, -1);
-			}
-			g_free(path);
-		}
-		GtkLabel *label;
-		gchar *status_str;
 
-		status_str = working_status_string(ud, &status.queue);
-		label = GTK_LABEL(GHB_WIDGET(ud->builder, "queue_status"));
-		gtk_label_set_text (label, status_str);
-		g_free(status_str);
-	}
 	if (status.scan.state & GHB_STATE_WORKING)
 	{
 		GtkProgressBar *live_progress;
@@ -2146,6 +2609,34 @@ ghb_backend_events(signal_user_data_t *ud)
 	}
 }
 
+#if GTK_CHECK_VERSION(2, 16, 0)
+G_MODULE_EXPORT gboolean
+status_icon_query_tooltip_cb(
+	GtkStatusIcon *si,
+	gint           x,
+	gint           y,
+	gboolean       kbd_mode,
+	GtkTooltip    *tt,
+	signal_user_data_t *ud)
+{
+	ghb_status_t status;
+	gchar *status_str;
+
+	ghb_get_status(&status);
+	if (status.queue.state & GHB_STATE_WORKING)
+		status_str = working_status_string(ud, &status.queue);
+	else if (status.queue.state & GHB_STATE_WORKDONE)
+		status_str = g_strdup("Encode Complete");
+	else
+		status_str = g_strdup("HandBrake");
+
+	gtk_tooltip_set_text(tt, status_str);
+	gtk_tooltip_set_icon_from_icon_name(tt, "hb-icon", GTK_ICON_SIZE_BUTTON);
+	g_free(status_str);
+	return TRUE;
+}
+#endif
+
 G_MODULE_EXPORT gboolean
 ghb_timer_cb(gpointer data)
 {
@@ -2171,9 +2662,41 @@ ghb_timer_cb(gpointer data)
 	}
 	if (update_preview)
 	{
+		g_debug("Updating preview\n");
 		ghb_set_preview_image (ud);
 		update_preview = FALSE;
 	}
+
+	if (!appcast_busy)
+	{
+		gchar *updates;
+		updates = ghb_settings_get_string(ud->settings, "check_updates");
+		gint64 duration = 0;
+		if (strcmp(updates, "daily") == 0)
+			duration = 60 * 60 * 24;
+		else if (strcmp(updates, "weekly") == 0)
+			duration = 60 * 60 * 24 * 7;
+		else if (strcmp(updates, "monthly") == 0)
+			duration = 60 * 60 * 24 * 7;
+
+		g_free(updates);
+		if (duration != 0)
+		{
+			gint64 last;
+			time_t tt;
+
+			last = ghb_settings_get_int64(ud->settings, "last_update_check");
+			time(&tt);
+			if (last + duration < tt)
+			{
+				ghb_settings_set_int64(ud->settings, 
+										"last_update_check", tt);
+				ghb_pref_save(ud->settings, "last_update_check");
+				g_thread_create((GThreadFunc)ghb_check_update, ud, 
+								FALSE, NULL);
+			}
+		}
+	}
 	return TRUE;
 }
 
@@ -2181,7 +2704,7 @@ G_MODULE_EXPORT gboolean
 ghb_log_cb(GIOChannel *source, GIOCondition cond, gpointer data)
 {
 	gchar *text = NULL;
-	gsize length;
+	gsize length, outlength;
 	GtkTextView *textview;
 	GtkTextBuffer *buffer;
 	GtkTextIter iter;
@@ -2192,7 +2715,11 @@ ghb_log_cb(GIOChannel *source, GIOCondition cond, gpointer data)
 	signal_user_data_t *ud = (signal_user_data_t*)data;
 
 	status = g_io_channel_read_line (source, &text, &length, NULL, &gerror);
-	if (text != NULL)
+	// Trim nils from end of text, they cause g_io_channel_write_chars to
+	// fail with an assertion that aborts
+	while (length > 0 && text[length-1] == 0)
+		length--;
+	if (text != NULL && length > 0)
 	{
 		GdkWindow *window;
 		gint width, height;
@@ -2236,7 +2763,7 @@ ghb_log_cb(GIOChannel *source, GIOCondition cond, gpointer data)
 		text[length-1] = '\r';
 #endif
 		g_io_channel_write_chars (ud->activity_log, text, 
-								length, &length, NULL);
+								length, &outlength, NULL);
 #if defined(_WIN32)
 		g_io_channel_write_chars (ud->activity_log, "\n", 
 								one, &one, NULL);
@@ -2245,15 +2772,17 @@ ghb_log_cb(GIOChannel *source, GIOCondition cond, gpointer data)
 		if (ud->job_activity_log)
 		{
 			g_io_channel_write_chars (ud->job_activity_log, text, 
-									length, &length, NULL);
+									length, &outlength, NULL);
 #if defined(_WIN32)
 			g_io_channel_write_chars (ud->activity_log, "\n", 
-									one, &one, NULL);
+									one, &outlength, NULL);
 #endif
 			g_io_channel_flush(ud->job_activity_log, NULL);
 		}
-		g_free(text);
 	}
+	if (text != NULL)
+		g_free(text);
+
 	if (status != G_IO_STATUS_NORMAL)
 	{
 		// This should never happen, but if it does I would get into an
@@ -2320,7 +2849,7 @@ ghb_log(gchar *log, ...)
 
 	_now = time(NULL);
 	now = localtime( &_now );
-	snprintf(fmt, 362, "[%02d:%02d:%02d] lingui: %s\n", 
+	snprintf(fmt, 362, "[%02d:%02d:%02d] gtkgui: %s\n", 
 			now->tm_hour, now->tm_min, now->tm_sec, log);
 	va_start(args, log);
 	vfprintf(stderr, fmt, args);
@@ -2676,6 +3205,33 @@ pref_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 }
 
 G_MODULE_EXPORT void
+use_m4v_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+	g_debug("use_m4v_changed_cb");
+	ghb_widget_to_setting (ud->settings, widget);
+	ghb_check_dependency(ud, widget);
+	const gchar *name = gtk_widget_get_name(widget);
+	ghb_pref_save(ud->settings, name);
+	ghb_update_destination_extension(ud);
+}
+
+G_MODULE_EXPORT void
+show_status_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+	g_debug("show_status_cb");
+	ghb_widget_to_setting (ud->settings, widget);
+	ghb_check_dependency(ud, widget);
+	const gchar *name = gtk_widget_get_name(widget);
+	ghb_pref_save(ud->settings, name);
+
+	GtkStatusIcon *si;
+
+	si = GTK_STATUS_ICON(GHB_OBJECT (ud->builder, "hb_status"));
+	gtk_status_icon_set_visible(si,
+			ghb_settings_get_boolean(ud->settings, "show_status"));
+}
+
+G_MODULE_EXPORT void
 vqual_granularity_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
 	g_debug("vqual_granularity_changed_cb");
@@ -2723,13 +3279,14 @@ hbfd_feature_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 	gtk_action_set_visible(action, hbfd);
 }
 
-void
+gboolean
 ghb_file_menu_add_dvd(signal_user_data_t *ud)
 {
 	GList *link, *drives;
 	static GtkActionGroup *agroup = NULL;
 	static gint merge_id;
 
+	g_debug("ghb_file_menu_add_dvd()");
 	link = drives = dvd_device_list();
 	if (drives != NULL)
 	{
@@ -2776,11 +3333,12 @@ ghb_file_menu_add_dvd(signal_user_data_t *ud)
 				(GCallback)dvd_source_activate_cb, ud);
 			g_free(name);
 			g_free(drive);
-			g_object_unref(link->data);
+			free_drive(link->data);
 			link = link->next;
 		}
 		g_list_free(drives);
 	}
+	return FALSE;
 }
 
 gboolean ghb_is_cd(GDrive *gd);
@@ -2851,10 +3409,14 @@ ghb_is_cd(GDrive *gd)
 	LibHalDriveType dtype;
 
 	device = g_drive_get_identifier(gd, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
+	if (device == NULL)
+		return FALSE;
 	halDrive = libhal_drive_from_device_file (hal_ctx, device);
+	g_free(device);
+	if (halDrive == NULL)
+		return FALSE;
 	dtype = libhal_drive_get_type(halDrive);
 	libhal_drive_free(halDrive);
-	g_free(device);
 	return (dtype == LIBHAL_DRIVE_TYPE_CDROM);
 #else
 	return FALSE;
@@ -2881,18 +3443,16 @@ handle_media_change(const gchar *device, gboolean insert, signal_user_data_t *ud
 		ins_count++;
 		if (ins_count == 2)
 		{
-			ghb_file_menu_add_dvd(ud);
-			if (ud->current_dvd_device != NULL &&
+			g_thread_create((GThreadFunc)ghb_cache_volnames, ud, FALSE, NULL);
+			if (ghb_settings_get_boolean(ud->settings, "AutoScan") &&
+				ud->current_dvd_device != NULL &&
 				strcmp(device, ud->current_dvd_device) == 0)
 			{
-				GtkProgressBar *progress;
-				progress = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "progressbar"));
-				gtk_progress_bar_set_text (progress, "Scanning ...");
-				gtk_progress_bar_set_fraction (progress, 0);
-				update_source_label(ud, device);
+				show_scan_progress(ud);
+				update_source_label(ud, device, TRUE);
 				gint preview_count;
 				preview_count = ghb_settings_get_int(ud->settings, "preview_count");
-				ghb_backend_scan(device, 0, preview_count);
+				start_scan(ud, device, 0, preview_count);
 			}
 		}
 	}
@@ -2902,13 +3462,14 @@ handle_media_change(const gchar *device, gboolean insert, signal_user_data_t *ud
 		rem_count++;
 		if (rem_count == 2)
 		{
-			ghb_file_menu_add_dvd(ud);
+			g_thread_create((GThreadFunc)ghb_cache_volnames, ud, FALSE, NULL);
 			if (ud->current_dvd_device != NULL &&
 				strcmp(device, ud->current_dvd_device) == 0)
 			{
 				ghb_hb_cleanup(TRUE);
 				prune_logs(ud);
-				ghb_backend_scan("/dev/null", 0, 1);
+				ghb_settings_set_string(ud->settings, "source", "/dev/null");
+				start_scan(ud, "/dev/null", 0, 1);
 			}
 		}
 	}
@@ -2972,33 +3533,37 @@ wm_drive_changed(MSG *msg, signal_user_data_t *ud)
 G_MODULE_EXPORT void
 drive_changed_cb(GVolumeMonitor *gvm, GDrive *gd, signal_user_data_t *ud)
 {
-	g_debug("drive_changed_cb()");
-	ghb_file_menu_add_dvd(ud);
-
 	gchar *device;
+	gint state;
 
+	g_debug("drive_changed_cb()");
+	g_thread_create((GThreadFunc)ghb_cache_volnames, ud, FALSE, NULL);
+
+	state = ghb_get_scan_state();
 	device = g_drive_get_identifier(gd, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
 	if (ud->current_dvd_device == NULL ||
-		strcmp(device, ud->current_dvd_device) != 0)
+		strcmp(device, ud->current_dvd_device) != 0 ||
+		state != GHB_STATE_IDLE )
 	{
 		return;
 	}
 	if (g_drive_has_media(gd))
 	{
-		GtkProgressBar *progress;
-		progress = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "progressbar"));
-		gtk_progress_bar_set_text (progress, "Scanning ...");
-		gtk_progress_bar_set_fraction (progress, 0);
-		update_source_label(ud, device);
-		gint preview_count;
-		preview_count = ghb_settings_get_int(ud->settings, "preview_count");
-		ghb_backend_scan(device, 0, preview_count);
+		if (ghb_settings_get_boolean(ud->settings, "AutoScan"))
+		{
+			show_scan_progress(ud);
+			update_source_label(ud, device, TRUE);
+			gint preview_count;
+			preview_count = ghb_settings_get_int(ud->settings, "preview_count");
+			start_scan(ud, device, 0, preview_count);
+		}
 	}
 	else
 	{
 		ghb_hb_cleanup(TRUE);
 		prune_logs(ud);
-		ghb_backend_scan("/dev/null", 0, 1);
+		ghb_settings_set_string(ud->settings, "source", "/dev/null");
+		start_scan(ud, "/dev/null", 0, 1);
 	}
 }
 #endif
@@ -3010,13 +3575,201 @@ dbus_init (void)
 	dbus_g_thread_init();
 }
 
-#define GPM_DBUS_SERVICE			"org.freedesktop.PowerManagement"
+#define GPM_DBUS_PM_SERVICE			"org.freedesktop.PowerManagement"
+#define GPM_DBUS_PM_PATH			"/org/freedesktop/PowerManagement"
+#define GPM_DBUS_PM_INTERFACE		"org.freedesktop.PowerManagement"
 #define GPM_DBUS_INHIBIT_PATH		"/org/freedesktop/PowerManagement/Inhibit"
 #define GPM_DBUS_INHIBIT_INTERFACE	"org.freedesktop.PowerManagement.Inhibit" 
 static gboolean gpm_inhibited = FALSE;
 static guint gpm_cookie = -1;
 #endif
 
+static gboolean
+ghb_can_suspend_gpm()
+{
+	gboolean can_suspend = FALSE;
+#if !defined(_WIN32)
+	DBusGConnection *conn;
+	DBusGProxy	*proxy;
+	GError *error = NULL;
+	gboolean res;
+	
+
+	g_debug("ghb_can_suspend_gpm()");
+	conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+	if (error != NULL)
+	{
+		g_warning("DBUS cannot connect: %s", error->message);
+		g_error_free(error);
+		return FALSE;
+	}
+	proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
+							GPM_DBUS_PM_PATH, GPM_DBUS_PM_INTERFACE);
+	if (proxy == NULL)
+	{
+		g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
+		dbus_g_connection_unref(conn);
+		return FALSE;
+	}
+	res = dbus_g_proxy_call(proxy, "CanSuspend", &error,
+							G_TYPE_INVALID,
+							G_TYPE_BOOLEAN, &can_suspend,
+							G_TYPE_INVALID);
+	if (!res)
+	{
+		if (error != NULL)
+		{
+			g_warning("CanSuspend failed: %s", error->message);
+			g_error_free(error);
+		}
+		else
+			g_warning("CanSuspend failed");
+		// Try to shutdown anyway
+		can_suspend = TRUE;
+	}
+	g_object_unref(G_OBJECT(proxy));
+	dbus_g_connection_unref(conn);
+#endif
+	return can_suspend;
+}
+
+static void
+ghb_suspend_gpm()
+{
+#if !defined(_WIN32)
+	DBusGConnection *conn;
+	DBusGProxy	*proxy;
+	GError *error = NULL;
+	gboolean res;
+	
+
+	g_debug("ghb_suspend_gpm()");
+	conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+	if (error != NULL)
+	{
+		g_warning("DBUS cannot connect: %s", error->message);
+		g_error_free(error);
+		return;
+	}
+	proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
+							GPM_DBUS_PM_PATH, GPM_DBUS_PM_INTERFACE);
+	if (proxy == NULL)
+	{
+		g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
+		dbus_g_connection_unref(conn);
+		return;
+	}
+	res = dbus_g_proxy_call(proxy, "Suspend", &error,
+							G_TYPE_INVALID,
+							G_TYPE_INVALID);
+	if (!res)
+	{
+		if (error != NULL)
+		{
+			g_warning("Suspend failed: %s", error->message);
+			g_error_free(error);
+		}
+		else
+			g_warning("Suspend failed");
+	}
+	g_object_unref(G_OBJECT(proxy));
+	dbus_g_connection_unref(conn);
+#endif
+}
+
+static gboolean
+ghb_can_shutdown_gpm()
+{
+	gboolean can_shutdown = FALSE;
+#if !defined(_WIN32)
+	DBusGConnection *conn;
+	DBusGProxy	*proxy;
+	GError *error = NULL;
+	gboolean res;
+	
+
+	g_debug("ghb_can_shutdown_gpm()");
+	conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+	if (error != NULL)
+	{
+		g_warning("DBUS cannot connect: %s", error->message);
+		g_error_free(error);
+		return FALSE;
+	}
+	proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
+							GPM_DBUS_PM_PATH, GPM_DBUS_PM_INTERFACE);
+	if (proxy == NULL)
+	{
+		g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
+		dbus_g_connection_unref(conn);
+		return FALSE;
+	}
+	res = dbus_g_proxy_call(proxy, "CanShutdown", &error,
+							G_TYPE_INVALID,
+							G_TYPE_BOOLEAN, &can_shutdown,
+							G_TYPE_INVALID);
+	if (!res)
+	{
+		if (error != NULL)
+		{
+			g_warning("CanShutdown failed: %s", error->message);
+			g_error_free(error);
+		}
+		else
+			g_warning("CanShutdown failed");
+		// Try to shutdown anyway
+		can_shutdown = TRUE;
+	}
+	g_object_unref(G_OBJECT(proxy));
+	dbus_g_connection_unref(conn);
+#endif
+	return can_shutdown;
+}
+
+static void
+ghb_shutdown_gpm()
+{
+#if !defined(_WIN32)
+	DBusGConnection *conn;
+	DBusGProxy	*proxy;
+	GError *error = NULL;
+	gboolean res;
+	
+
+	g_debug("ghb_shutdown_gpm()");
+	conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+	if (error != NULL)
+	{
+		g_warning("DBUS cannot connect: %s", error->message);
+		g_error_free(error);
+		return;
+	}
+	proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
+							GPM_DBUS_PM_PATH, GPM_DBUS_PM_INTERFACE);
+	if (proxy == NULL)
+	{
+		g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
+		dbus_g_connection_unref(conn);
+		return;
+	}
+	res = dbus_g_proxy_call(proxy, "Shutdown", &error,
+							G_TYPE_INVALID,
+							G_TYPE_INVALID);
+	if (!res)
+	{
+		if (error != NULL)
+		{
+			g_warning("Shutdown failed: %s", error->message);
+			g_error_free(error);
+		}
+		else
+			g_warning("Shutdown failed");
+	}
+	g_object_unref(G_OBJECT(proxy));
+	dbus_g_connection_unref(conn);
+#endif
+}
+
 void
 ghb_inhibit_gpm()
 {
@@ -3036,15 +3789,15 @@ ghb_inhibit_gpm()
 	conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
 	if (error != NULL)
 	{
-		g_debug("DBUS cannot connect: %s", error->message);
+		g_warning("DBUS cannot connect: %s", error->message);
 		g_error_free(error);
 		return;
 	}
-	proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_SERVICE,
+	proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
 							GPM_DBUS_INHIBIT_PATH, GPM_DBUS_INHIBIT_INTERFACE);
 	if (proxy == NULL)
 	{
-		g_debug("Could not get DBUS proxy: %s", GPM_DBUS_SERVICE);
+		g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
 		dbus_g_connection_unref(conn);
 		return;
 	}
@@ -3054,18 +3807,20 @@ ghb_inhibit_gpm()
 							G_TYPE_INVALID,
 							G_TYPE_UINT, &gpm_cookie,
 							G_TYPE_INVALID);
+	gpm_inhibited = TRUE;
 	if (!res)
 	{
-		g_warning("Inhibit method failed");
-		gpm_cookie = -1;
-	}
-	if (error != NULL)
-	{
-		g_warning("Inhibit problem: %s", error->message);
-		g_error_free(error);
+		if (error != NULL)
+		{
+			g_warning("Inhibit failed: %s", error->message);
+			g_error_free(error);
+			gpm_cookie = -1;
+		}
+		else
+			g_warning("Inhibit failed");
 		gpm_cookie = -1;
+		gpm_inhibited = FALSE;
 	}
-	gpm_inhibited = TRUE;
 	g_object_unref(G_OBJECT(proxy));
 	dbus_g_connection_unref(conn);
 #endif
@@ -3090,15 +3845,15 @@ ghb_uninhibit_gpm()
 	conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
 	if (error != NULL)
 	{
-		g_debug("DBUS cannot connect: %s", error->message);
+		g_warning("DBUS cannot connect: %s", error->message);
 		g_error_free(error);
 		return;
 	}
-	proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_SERVICE,
+	proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
 							GPM_DBUS_INHIBIT_PATH, GPM_DBUS_INHIBIT_INTERFACE);
 	if (proxy == NULL)
 	{
-		g_debug("Could not get DBUS proxy: %s", GPM_DBUS_SERVICE);
+		g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
 		dbus_g_connection_unref(conn);
 		return;
 	}
@@ -3108,12 +3863,13 @@ ghb_uninhibit_gpm()
 							G_TYPE_INVALID);
 	if (!res)
 	{
-		g_warning("UnInhibit method failed");
-	}
-	if (error != NULL)
-	{
-		g_warning("UnInhibit problem: %s", error->message);
-		g_error_free(error);
+		if (error != NULL)
+		{
+			g_warning("UnInhibit failed: %s", error->message);
+			g_error_free(error);
+		}
+		else
+			g_warning("UnInhibit failed");
 	}
 	gpm_inhibited = FALSE;
 	dbus_g_connection_unref(conn);
@@ -3311,7 +4067,6 @@ format_vquality_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
 				return g_strdup_printf("QP: %.4g (%.0f%%)", val, percent);
 		} break;
 
-		case HB_VCODEC_XVID:
 		case HB_VCODEC_FFMPEG:
 		{
 			percent = 100. * (30 - (val - 1)) / 30.;
@@ -3332,23 +4087,13 @@ format_vquality_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
 	return g_strdup_printf("QP: %.1f / %.1f%%", val, percent);
 }
 
-#if !defined(_WIN32)
-G_MODULE_EXPORT void
-html_link_cb(GtkHTML *html, const gchar *url, signal_user_data_t *ud)
-{
-	browse_url(url);
-}
-#endif
-
-static gpointer check_stable_update(signal_user_data_t *ud);
-static gboolean stable_update_lock = FALSE;
-
 static void
 process_appcast(signal_user_data_t *ud)
 {
 	gchar *description = NULL, *build = NULL, *version = NULL, *msg;
 #if !defined(_WIN32)
-	GtkWidget *html, *window;
+	GtkWidget *window;
+	static GtkWidget *html = NULL;
 #endif
 	GtkWidget *dialog, *label;
 	gint	response, ibuild = 0, skip;
@@ -3356,8 +4101,6 @@ process_appcast(signal_user_data_t *ud)
 	if (ud->appcast == NULL || ud->appcast_len < 15 || 
 		strncmp(&(ud->appcast[9]), "200 OK", 6))
 	{
-		if (!stable_update_lock && hb_get_build(NULL) % 100)
-			g_idle_add((GSourceFunc)check_stable_update, ud);
 		goto done;
 	}
 	ghb_appcast_parse(ud->appcast, &description, &build, &version);
@@ -3367,29 +4110,28 @@ process_appcast(signal_user_data_t *ud)
 	if (description == NULL || build == NULL || version == NULL 
 		|| ibuild <= hb_get_build(NULL) || skip == ibuild)
 	{
-		if (!stable_update_lock && hb_get_build(NULL) % 100)
-			g_thread_create((GThreadFunc)check_stable_update, ud, FALSE, NULL);
 		goto done;
 	}
 	msg = g_strdup_printf("HandBrake %s/%s is now available (you have %s/%d).",
 			version, build, hb_get_version(NULL), hb_get_build(NULL));
 	label = GHB_WIDGET(ud->builder, "update_message");
 	gtk_label_set_text(GTK_LABEL(label), msg);
+
 #if !defined(_WIN32)
-	html = gtk_html_new_from_string(description, -1);
-	g_signal_connect(html, "link_clicked", G_CALLBACK(html_link_cb), ud);
-	window = GHB_WIDGET(ud->builder, "update_scroll");
-	gtk_container_add(GTK_CONTAINER(window), html);
-	// Show it
-	gtk_widget_set_size_request(html, 420, 240);
-	gtk_widget_show(html);
+	if (html == NULL)
+	{
+		html = webkit_web_view_new();
+		window = GHB_WIDGET(ud->builder, "update_scroll");
+		gtk_container_add(GTK_CONTAINER(window), html);
+		// Show it
+		gtk_widget_set_size_request(html, 420, 240);
+		gtk_widget_show(html);
+	}
+	webkit_web_view_open(WEBKIT_WEB_VIEW(html), description);
 #endif
 	dialog = GHB_WIDGET(ud->builder, "update_dialog");
 	response = gtk_dialog_run(GTK_DIALOG(dialog));
 	gtk_widget_hide(dialog);
-#if !defined(_WIN32)
-	gtk_widget_destroy(html);
-#endif
 	if (response == GTK_RESPONSE_OK)
 	{
 		// Skip
@@ -3405,6 +4147,7 @@ done:
 	g_free(ud->appcast);
 	ud->appcast_len = 0;
 	ud->appcast = NULL;
+	appcast_busy = FALSE;
 }
 
 void
@@ -3462,6 +4205,7 @@ ghb_net_open(signal_user_data_t *ud, gchar *address, gint port)
 	if( !( host = gethostbyname( address ) ) )
 	{
 		g_warning( "gethostbyname failed (%s)", address );
+		appcast_busy = FALSE;
 		return NULL;
 	}
 
@@ -3474,12 +4218,14 @@ ghb_net_open(signal_user_data_t *ud, gchar *address, gint port)
 	if( fd < 0 )
 	{
 		g_debug( "socket failed" );
+		appcast_busy = FALSE;
 		return NULL;
 	}
 
 	if(connect(fd, (struct sockaddr*)&sock, sizeof(struct sockaddr_in )) < 0 )
 	{
 		g_debug( "connect failed" );
+		appcast_busy = FALSE;
 		return NULL;
 	}
 	ioc = g_io_channel_unix_new(fd);
@@ -3497,58 +4243,70 @@ ghb_check_update(signal_user_data_t *ud)
 	gsize len;
 	GIOChannel *ioc;
 	GError *gerror = NULL;
+	GRegex *regex;
+	GMatchInfo *mi;
+	gchar *host, *appcast;
 
 	g_debug("ghb_check_update");
-	if (hb_get_build(NULL) % 100)
+	appcast_busy = TRUE;
+	regex = g_regex_new("^http://(.+)/(.+)$", 0, 0, NULL);
+	if (!g_regex_match(regex, HB_PROJECT_URL_APPCAST, 0, &mi))
 	{
-		query = 
-		"GET /appcast_unstable.xml HTTP/1.0\r\nHost: handbrake.fr\r\n\r\n";
-	}
-	else
-	{
-		stable_update_lock = TRUE;
-		query = "GET /appcast.xml HTTP/1.0\r\nHost: handbrake.fr\r\n\r\n";
-	}
-	ioc = ghb_net_open(ud, "handbrake.fr", 80);
-	if (ioc == NULL)
 		return NULL;
+	}
 
-	g_io_channel_write_chars(ioc, query, strlen(query), &len, &gerror);
-	g_io_channel_flush(ioc, &gerror);
-	// This function is initiated by g_idle_add.  Must return false
-	// so that it is not called again
-	return NULL;
-}
+	host = g_match_info_fetch(mi, 1);
+	appcast = g_match_info_fetch(mi, 2);
 
-static gpointer
-check_stable_update(signal_user_data_t *ud)
-{
-	gchar *query;
-	gsize len;
-	GIOChannel *ioc;
-	GError *gerror = NULL;
+	if (host == NULL || appcast == NULL)
+		return NULL;
 
-	g_debug("check_stable_update");
-	stable_update_lock = TRUE;
-	query = "GET /appcast.xml HTTP/1.0\r\nHost: handbrake.fr\r\n\r\n";
-	ioc = ghb_net_open(ud, "handbrake.fr", 80);
+	query = g_strdup_printf( "GET /%s HTTP/1.0\r\nHost: %s\r\n\r\n",
+							appcast, host);
+
+	ioc = ghb_net_open(ud, host, 80);
 	if (ioc == NULL)
 		return NULL;
 
 	g_io_channel_write_chars(ioc, query, strlen(query), &len, &gerror);
 	g_io_channel_flush(ioc, &gerror);
-	// This function is initiated by g_idle_add.  Must return false
-	// so that it is not called again
+	g_free(query);
+	g_free(host);
+	g_free(appcast);
+	g_match_info_free(mi);
+	g_regex_unref(regex);
 	return NULL;
 }
 
+G_MODULE_EXPORT gboolean
+hb_visibility_event_cb(
+	GtkWidget *widget, 
+	GdkEventVisibility *vs, 
+	signal_user_data_t *ud)
+{
+	ud->hb_visibility = vs->state;
+	return FALSE;
+}
+
 G_MODULE_EXPORT void
 status_activate_cb(GtkStatusIcon *si, signal_user_data_t *ud)
 {
 	GtkWindow *window;
+	GdkWindowState state;
 
 	window = GTK_WINDOW(GHB_WIDGET(ud->builder, "hb_window"));
-	gtk_window_present(window);
+	state = gdk_window_get_state(GTK_WIDGET(window)->window);
+	if ((state & GDK_WINDOW_STATE_ICONIFIED) ||
+		(ud->hb_visibility != GDK_VISIBILITY_UNOBSCURED))
+	{
+		gtk_window_present(window);
+		gtk_window_set_skip_taskbar_hint(window, FALSE);
+	}
+	else
+	{
+		gtk_window_set_skip_taskbar_hint(window, TRUE);
+		gtk_window_iconify(window);
+	}
 }
 
 #if !defined(_WIN32)
@@ -3564,8 +4322,10 @@ ghb_notify_done(signal_user_data_t *ud)
 {
 	GtkStatusIcon *si;
 
+	if (ghb_settings_combo_int(ud->settings, "WhenComplete") == 0)
+		return;
+
 	si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
-	gtk_status_icon_set_from_icon_name(si, "hb-status-empty");
 
 #if !defined(_WIN32)
 	NotifyNotification *notification;
@@ -3578,4 +4338,25 @@ ghb_notify_done(signal_user_data_t *ud)
 	g_signal_connect(notification, "closed", (GCallback)notify_closed_cb, ud);
 	notify_notification_show(notification, NULL);
 #endif
+
+	if (ghb_settings_combo_int(ud->settings, "WhenComplete") == 3)
+	{
+		if (ghb_can_shutdown_gpm())
+		{
+			ghb_countdown_dialog(GTK_MESSAGE_WARNING, 
+				"Your encode is complete.",
+				"Shutting down the computer", 
+				"Cancel", (GSourceFunc)shutdown_cb, 60);
+		}
+	}
+	if (ghb_settings_combo_int(ud->settings, "WhenComplete") == 2)
+	{
+		if (ghb_can_suspend_gpm())
+		{
+			ghb_countdown_dialog(GTK_MESSAGE_WARNING, 
+				"Your encode is complete.",
+				"Putting computer to sleep", 
+				"Cancel", (GSourceFunc)suspend_cb, 60);
+		}
+	}
 }