maryjane
/
syncevolution
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gtk-ui: don't allow non-defined sources in emergency 

source selection in emergency view let user pick sources that were
not fully defined (e.g. missing url).
This commit is contained in:
Jussi Kukkonen 2010-01-28 12:38:02 +02:00 committed by Patrick Ohly
parent 9eac091879
commit e6a69ce45a
3 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gtk-ui/sync-ui-config.c
View File

@ -87,6 +87,21 @@ server_config_init (server_config *server, SyncevoConfig *config)
}
}
gboolean
source_config_is_usable (source_config *source)
{
const char *source_uri;
source_uri = g_hash_table_lookup (source->config, "uri");
if (!source_config_is_enabled (source) ||
!source_uri ||
strlen (source_uri) == 0 ||
!source->supported_locally) {
return FALSE;
}
return TRUE;
}
gboolean
source_config_is_enabled (source_config *source)
@ -94,7 +109,6 @@ source_config_is_enabled (source_config *source)
char *mode;
mode = g_hash_table_lookup (source->config, "sync");
if (mode &&
(strcmp (mode, "none") == 0 ||
strcmp (mode, "disabled") == 0)) {

1
src/gtk-ui/sync-ui-config.h
View File

@ -60,6 +60,7 @@ typedef struct server_config {
SyncevoConfig *config;
} server_config;
gboolean source_config_is_usable (source_config *source);
gboolean source_config_is_enabled (source_config *source);
void source_config_free (source_config *source);

21
src/gtk-ui/sync-ui.c
View File

@ -1082,6 +1082,7 @@ add_emergency_source (const char *name, source_config *conf, app_data *data)
pretty_name = get_pretty_source_name (name);
toggle = add_emergency_toggle_widget (data, pretty_name, active, row, col);
gtk_widget_set_sensitive (toggle, source_config_is_usable (conf));
g_object_set_data_full (G_OBJECT (toggle), "source", g_strdup (name), g_free);
g_free (pretty_name);
@ -1361,17 +1362,8 @@ update_service_source_ui (const char *name, source_config *conf, app_data *data)
{
GtkWidget *lbl, *box;
char *pretty_name, *title;
const char *source_uri, *sync;
source_uri = g_hash_table_lookup (conf->config, "uri");
sync = g_hash_table_lookup (conf->config, "sync");
if (!sync ||
strcmp (sync, "disabled") == 0 ||
strcmp (sync, "none") == 0 ||
!source_uri ||
strlen (source_uri) == 0 ||
!conf->supported_locally) {
if (!source_config_is_usable (conf)) {
return;
}
@ -2152,10 +2144,11 @@ get_reports_cb (SyncevoServer *server,
if (!data->forced_emergency) {
/* if user initiates a emergency sync wihtout forced_emergency,
enable all sources by default*/
g_hash_table_iter_init (&iter, sources);
while (g_hash_table_iter_next (&iter, (gpointer)&key, NULL)) {
g_hash_table_insert (data->emergency_sources,
g_strdup (key), "");
g_hash_table_iter_init (&iter, data->current_service->source_configs);
while (g_hash_table_iter_next (&iter, (gpointer)&key, (gpointer)&source_conf)) {
if (source_config_is_usable (source_conf)) {
g_hash_table_insert (data->emergency_sources, g_strdup (key), "");
}
}
}