Attachment #411398 for bug #560032




++ gtkam-0.2.0-format-security/src/gtkam-port.c

	if (index < 0) {
		msg = g_strdup_printf (_("The port '%s' could not be found. Please make sure "
		        "that the port exists."), path);
		d = gtkam_error_new (index, NULL, GTK_WIDGET (port), "%s", msg);
		g_free (msg);
		gtk_window_set_transient_for (GTK_WINDOW (d),
					      GTK_WINDOW (port));
++ gtkam-0.2.0-format-security/src/gtkam-save.c

		msg = g_strdup_printf (_("The file '%s' already exists."),
				       full_path);
		if (!save->priv->err_shown) {
			dialog = gtkam_error_new (GP_ERROR_FILE_EXISTS, NULL, GTK_WIDGET (save), "%s", msg);
			gtk_window_set_transient_for (GTK_WINDOW (dialog),
						      save->priv->main_window);
			gtk_widget_show (dialog);
++ gtkam-0.2.0-format-security/src/gtkam-tree.c

		msg = g_strdup_printf (_("The file '%s' already exists."),
				       full_path);
		dialog = gtkam_error_new (GP_ERROR_FILE_EXISTS, NULL,
					  GTK_WIDGET (save), "%s", msg);
		gtk_widget_show (dialog);
		g_free (msg);
		g_free (full_path);

Return to bug 560032

Line Link Here

(-)file_not_specified_in_diff (-6 / +6 lines)
0	-- gtkam-0.2.0/src/gtkam-port.c	0	++ gtkam-0.2.0-format-security/src/gtkam-port.c
Lines 145-151 on_ok_clicked (GtkButton *button, GtkamP Link Here
145	if (index < 0) {	145	if (index < 0) {
146	msg = g_strdup_printf (_("The port '%s' could not be found. Please make sure "	146	msg = g_strdup_printf (_("The port '%s' could not be found. Please make sure "
147	"that the port exists."), path);	147	"that the port exists."), path);
148	d = gtkam_error_new (index, NULL, GTK_WIDGET (port), msg);	148	d = gtkam_error_new (index, NULL, GTK_WIDGET (port), "%s", msg);
149	g_free (msg);	149	g_free (msg);
150	gtk_window_set_transient_for (GTK_WINDOW (d),	150	gtk_window_set_transient_for (GTK_WINDOW (d),
151	GTK_WINDOW (port));	151	GTK_WINDOW (port));
152	-- gtkam-0.2.0/src/gtkam-save.c	152	++ gtkam-0.2.0-format-security/src/gtkam-save.c
Lines 299-305 save_file (GtkamSave save, const char Link Here
299	msg = g_strdup_printf (_("The file '%s' already exists."),	299	msg = g_strdup_printf (_("The file '%s' already exists."),
300	full_path);	300	full_path);
301	if (!save->priv->err_shown) {	301	if (!save->priv->err_shown) {
302	dialog = gtkam_error_new (GP_ERROR_FILE_EXISTS, NULL, GTK_WIDGET (save), msg);	302	dialog = gtkam_error_new (GP_ERROR_FILE_EXISTS, NULL, GTK_WIDGET (save), "%s", msg);
303	gtk_window_set_transient_for (GTK_WINDOW (dialog),	303	gtk_window_set_transient_for (GTK_WINDOW (dialog),
304	save->priv->main_window);	304	save->priv->main_window);
305	gtk_widget_show (dialog);	305	gtk_widget_show (dialog);
306	-- gtkam-0.2.0/src/gtkam-tree.c	306	++ gtkam-0.2.0-format-security/src/gtkam-tree.c
Lines 619-625 tree_save_file (CameraFile *file, const Link Here
619	msg = g_strdup_printf (_("The file '%s' already exists."),	619	msg = g_strdup_printf (_("The file '%s' already exists."),
620	full_path);	620	full_path);
621	dialog = gtkam_error_new (GP_ERROR_FILE_EXISTS, NULL,	621	dialog = gtkam_error_new (GP_ERROR_FILE_EXISTS, NULL,
622	GTK_WIDGET (save), msg);	622	GTK_WIDGET (save), "%s", msg);
623	gtk_widget_show (dialog);	623	gtk_widget_show (dialog);
624	g_free (msg);	624	g_free (msg);
625	g_free (full_path);	625	g_free (full_path);