Attachment #127942 for bug #133504

View | Details | Raw Unified | Return to bug 133504
Collapse All | Expand All




	}
	if (url->user)
		gtk_entry_set_text(service->username, url->user);
	if (service->pathentry) {
		GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER;

		if (service->provider && (service->provider->url_flags & CAMEL_URL_NEED_PATH_DIR) == 0)
			action = GTK_FILE_CHOOSER_ACTION_OPEN;

		if (action != gtk_file_chooser_get_action (GTK_FILE_CHOOSER (service->pathentry)))
			gtk_file_chooser_set_action (GTK_FILE_CHOOSER (service->pathentry), action);

		if (url->path)
			gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (service->pathentry), url->path);
	}

	tmp = camel_url_get_param(url, "use_ssl");
	if (tmp == NULL)




	return 0;
}

static void
em_update_accounts_2_11 (void)
{
	EAccountList *accounts;
	EIterator *iter;
	gboolean changed = FALSE;

	if (!(accounts = mail_config_get_accounts ()))
		return;

	iter = e_list_get_iterator ((EList *) accounts);
	while (e_iterator_is_valid (iter)) {
		EAccount *account = (EAccount *) e_iterator_get (iter);

		if (g_str_has_prefix (account->source->url, "spool://")) {
			if (g_file_test (account->source->url + 8, G_FILE_TEST_IS_DIR)) {
				char *str = g_strdup_printf ("spooldir://%s", account->source->url + 8);

				g_free (account->source->url);
				account->source->url = str;
				changed = TRUE;
			}
		}

		e_iterator_next (iter);
	}

	g_object_unref (iter);

	if (changed)
		mail_config_save_accounts ();
}

#endif

static int

		
		g_free (path);
	}

	if (major < 2 || (major == 2 && minor < 12)) {
		em_update_accounts_2_11 ();
	}
#endif	/* !G_OS_WIN32 */
	return 0;
}

Lines 1354-1360 Link Here

(-)evolution-2.10.2.orig/mail/mail-config.glade (-1 lines)
1354	<property name="right_attach">2</property>	1354	<property name="right_attach">2</property>
1355	<property name="top_attach">2</property>	1355	<property name="top_attach">2</property>
1356	<property name="bottom_attach">3</property>	1356	<property name="bottom_attach">3</property>
1357	<property name="x_options">fill</property>
1358	<property name="y_options"></property>	1357	<property name="y_options"></property>
1359	</packing>	1358	</packing>
1360	</child>	1359	</child>

Return to bug 133504

Lines 1665-1672 Link Here

(-)evolution-2.10.2.orig/mail/em-account-editor.c (-2 / +12 lines)
1665	}	1665	}
1666	if (url->user)	1666	if (url->user)
1667	gtk_entry_set_text(service->username, url->user);	1667	gtk_entry_set_text(service->username, url->user);
1668	if (service->pathentry && url->path)	1668	if (service->pathentry) {
1669	gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (service->pathentry), url->path);	1669	GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER;
		1670
		1671	if (service->provider && (service->provider->url_flags & CAMEL_URL_NEED_PATH_DIR) == 0)
		1672	action = GTK_FILE_CHOOSER_ACTION_OPEN;
		1673
		1674	if (action != gtk_file_chooser_get_action (GTK_FILE_CHOOSER (service->pathentry)))
		1675	gtk_file_chooser_set_action (GTK_FILE_CHOOSER (service->pathentry), action);
		1676
		1677	if (url->path)
		1678	gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (service->pathentry), url->path);
		1679	}
1670		1680
1671	tmp = camel_url_get_param(url, "use_ssl");	1681	tmp = camel_url_get_param(url, "use_ssl");
1672	if (tmp == NULL)	1682	if (tmp == NULL)

Lines 2638-2643 Link Here

(-)evolution-2.10.2.orig/mail/em-migrate.c (+37 lines)
2638	return 0;	2638	return 0;
2639	}	2639	}
2640		2640
		2641	static void
		2642	em_update_accounts_2_11 (void)
		2643	{
		2644	EAccountList *accounts;
		2645	EIterator *iter;
		2646	gboolean changed = FALSE;
		2647
		2648	if (!(accounts = mail_config_get_accounts ()))
		2649	return;
		2650
		2651	iter = e_list_get_iterator ((EList *) accounts);
		2652	while (e_iterator_is_valid (iter)) {
		2653	EAccount account = (EAccount ) e_iterator_get (iter);
		2654
		2655	if (g_str_has_prefix (account->source->url, "spool://")) {
		2656	if (g_file_test (account->source->url + 8, G_FILE_TEST_IS_DIR)) {
		2657	char *str = g_strdup_printf ("spooldir://%s", account->source->url + 8);
		2658
		2659	g_free (account->source->url);
		2660	account->source->url = str;
		2661	changed = TRUE;
		2662	}
		2663	}
		2664
		2665	e_iterator_next (iter);
		2666	}
		2667
		2668	g_object_unref (iter);
		2669
		2670	if (changed)
		2671	mail_config_save_accounts ();
		2672	}
		2673
2641	#endif	2674	#endif
2642		2675
2643	static int	2676	static int
Lines 2780-2785 Link Here
2780		2813
2781	g_free (path);	2814	g_free (path);
2782	}	2815	}
		2816
		2817	if (major < 2 \|\| (major == 2 && minor < 12)) {
		2818	em_update_accounts_2_11 ();
		2819	}
2783	#endif /* !G_OS_WIN32 */	2820	#endif /* !G_OS_WIN32 */
2784	return 0;	2821	return 0;
2785	}	2822	}