View | Details | Raw Unified
Collapse All | Expand All

(-) evolution-2.10.2.orig/mail/em-account-editor.c (-2 / +12 lines)
 Lines 1665-1672    Link Here  
	}
	}
	if (url->user)
	if (url->user)
		gtk_entry_set_text(service->username, url->user);
		gtk_entry_set_text(service->username, url->user);
	if (service->pathentry && url->path)
 
	if (service->pathentry) {
 
		gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (service->pathentry), url->path);
 
		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");
	tmp = camel_url_get_param(url, "use_ssl");

        
	if (tmp == NULL)
	if (tmp == NULL)



(-) evolution-2.10.2.orig/mail/em-migrate.c
      (+37 lines)




  

    

    

       Lines 2638-2643
       
    
  Link Here 
    

  

        
	return 0;
	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
#endif

        

        
static int
static int

  

    

    

       Lines 2780-2785
       
    
  Link Here 
    

  

        
		
		

        
		g_free (path);
		g_free (path);

        
	}
	}

            

              
              

            

            

              
              
	if (major < 2 || (major == 2 && minor < 12)) {

            

            

              
              
		em_update_accounts_2_11 ();

            

            

              
              
	}

            

        
#endif	/* !G_OS_WIN32 */
#endif	/* !G_OS_WIN32 */

        
	return 0;
	return 0;

        
}
}



(-) evolution-2.10.2.orig/mail/mail-config.glade
      (-1 lines)




  

    

    

       Lines 1354-1360
       
    
  Link Here 
    

  

        
				  <property name="right_attach">2</property>
				  <property name="right_attach">2</property>

        
				  <property name="top_attach">2</property>
				  <property name="top_attach">2</property>

        
				  <property name="bottom_attach">3</property>
				  <property name="bottom_attach">3</property>

            

              
				  <property name="x_options">fill</property>

              
            

        
				  <property name="y_options"></property>
				  <property name="y_options"></property>

        
				</packing>
				</packing>

        
			      </child>
			      </child>