Revision 3193

View differences:

src/plugin.c
299 299
void syl_plugin_signal_connect(const gchar *name, GCallback callback,
300 300
			       gpointer data)
301 301
{
302
	g_return_if_fail(plugin_obj != NULL);
303

  
302 304
	g_signal_connect(plugin_obj, name, callback, data);
303 305
}
304 306

  
305 307
void syl_plugin_signal_disconnect(gpointer func, gpointer data)
306 308
{
309
	g_return_if_fail(plugin_obj != NULL);
310

  
307 311
	g_signal_handlers_disconnect_by_func(plugin_obj, func, data);
308 312
}
309 313

  
......
311 315
{
312 316
	guint signal_id;
313 317

  
318
	g_return_if_fail(plugin_obj != NULL);
319

  
314 320
	if (g_signal_parse_name(name, G_TYPE_FROM_INSTANCE(plugin_obj), &signal_id, NULL, FALSE)) {
315 321
		 \
316 322
				va_list var_args;
......
345 351
	SylPluginLoadFunc load_func = NULL;
346 352
	gchar *file;
347 353

  
354
	g_return_val_if_fail(plugin_obj != NULL, -1);
348 355
	g_return_val_if_fail(name != NULL, -1);
349 356

  
350 357
	debug_print("syl_plugin_load: loading %s\n", name);
......
425 432
{
426 433
	GSList *cur;
427 434

  
435
	g_return_if_fail(plugin_obj != NULL);
436

  
428 437
	for (cur = module_list; cur != NULL; cur = cur->next) {
429 438
		GModule *module = (GModule *)cur->data;
430 439
		SylPluginUnloadFunc unload_func = NULL;
src/main.c
1 1
/*
2 2
 * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
3
 * Copyright (C) 1999-2012 Hiroyuki Yamamoto
3
 * Copyright (C) 1999-2013 Hiroyuki Yamamoto
4 4
 *
5 5
 * This program is free software; you can redistribute it and/or modify
6 6
 * it under the terms of the GNU General Public License as published by
......
132 132
	GPtrArray *status_full_folders;
133 133
	gchar *open_msg;
134 134
	gboolean configdir;
135
	gboolean safe_mode;
135 136
	gboolean exit;
136 137
	gboolean restart;
137 138
	gchar *argv0;
......
607 608
					(argv[i + 1], -1, NULL, NULL, NULL);
608 609
				i++;
609 610
			}
611
		} else if (!strncmp(argv[i], "--safemode", 10)) {
612
			cmd.safe_mode = TRUE;
610 613
		} else if (!strncmp(argv[i], "--exit", 6)) {
611 614
			cmd.exit = TRUE;
612 615
		} else if (!strncmp(argv[i], "--help", 6)) {
......
633 636
#endif
634 637
			g_print("%s\n", _("  --exit                 exit Sylpheed"));
635 638
			g_print("%s\n", _("  --debug                debug mode"));
639
			g_print("%s\n", _("  --safemode             safe mode"));
636 640
			g_print("%s\n", _("  --help                 display this help and exit"));
637 641
			g_print("%s\n", _("  --version              output version information and exit"));
638 642

  
......
1249 1253
		return;
1250 1254
	}
1251 1255

  
1256
	if (cmd.safe_mode) {
1257
		STATUSBAR_POP(mainwin);
1258
		return;
1259
	}
1260

  
1252 1261
	ADD_SYM(prog_version);
1253 1262
	ADD_SYM(app_will_exit);
1254 1263

  
ChangeLog
1 1
2013-01-22
2 2

  
3
	* src/main.c
4
	  src/plugin.c: added safe mode (don't load plug-ins).
5

  
6
2013-01-22
7

  
3 8
	* libsylph/folder.c
4 9
	  libsylph/news.c
5 10
	  libsylph/imap.c: escape server name when creating cache directory

Also available in: Unified diff