* src/main.c
code style normalization (curly braces, indentation).
+2006-03-14 [wwp] 2.0.0cvs137
+
+ * src/main.c
+ code style normalization (curly braces, indentation).
+
+2006-03-14 [wwp] 2.0.0cvs137
+
+ * src/main.c
+ code style (braces, indentation)
+
2006-03-12 [paul] 2.0.0cvs136
* src/prefs_common.c
2006-03-12 [paul] 2.0.0cvs136
* src/prefs_common.c
( cvs diff -u -r 1.13.2.21 -r 1.13.2.22 src/plugins/clamav/clamav_plugin.c; cvs diff -u -r 1.12.2.11 -r 1.12.2.12 src/plugins/dillo_viewer/dillo_viewer.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpcore/plugin.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/pgpinline/plugin.c; cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/plugins/pgpmime/plugin.c; cvs diff -u -r 1.18.2.31 -r 1.18.2.32 src/plugins/spamassassin/spamassassin.c; cvs diff -u -r 1.23.2.25 -r 1.23.2.26 src/plugins/spamassassin/spamassassin_gtk.c; ) > 2.0.0cvs134.patchset
( cvs diff -u -r 1.16.2.18 -r 1.16.2.19 src/prefs_display_header.c; cvs diff -u -r 1.43.2.35 -r 1.43.2.36 src/prefs_matcher.c; cvs diff -u -r 1.96.2.100 -r 1.96.2.101 src/textview.c; ) > 2.0.0cvs135.patchset
( cvs diff -u -r 1.204.2.79 -r 1.204.2.80 src/prefs_common.c; cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/prefs_summaries.c; ) > 2.0.0cvs136.patchset
( cvs diff -u -r 1.13.2.21 -r 1.13.2.22 src/plugins/clamav/clamav_plugin.c; cvs diff -u -r 1.12.2.11 -r 1.12.2.12 src/plugins/dillo_viewer/dillo_viewer.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpcore/plugin.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/pgpinline/plugin.c; cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/plugins/pgpmime/plugin.c; cvs diff -u -r 1.18.2.31 -r 1.18.2.32 src/plugins/spamassassin/spamassassin.c; cvs diff -u -r 1.23.2.25 -r 1.23.2.26 src/plugins/spamassassin/spamassassin_gtk.c; ) > 2.0.0cvs134.patchset
( cvs diff -u -r 1.16.2.18 -r 1.16.2.19 src/prefs_display_header.c; cvs diff -u -r 1.43.2.35 -r 1.43.2.36 src/prefs_matcher.c; cvs diff -u -r 1.96.2.100 -r 1.96.2.101 src/textview.c; ) > 2.0.0cvs135.patchset
( cvs diff -u -r 1.204.2.79 -r 1.204.2.80 src/prefs_common.c; cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/prefs_summaries.c; ) > 2.0.0cvs136.patchset
+( cvs diff -u -r 1.115.2.76 -r 1.115.2.77 src/main.c; ) > 2.0.0cvs137.patchset
+( cvs diff -u -r 1.115.2.76 -r 1.115.2.77 src/main.c; ) > 2.0.0cvs137.patchset
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
sn_context = sn_launchee_context_new_from_environment(sn_display,
DefaultScreen(xdisplay));
sn_context = sn_launchee_context_new_from_environment(sn_display,
DefaultScreen(xdisplay));
- if (sn_context != NULL)
- {
+ if (sn_context != NULL) {
sn_launchee_context_complete(sn_context);
sn_launchee_context_unref(sn_context);
sn_display_unref(sn_display);
}
sn_launchee_context_complete(sn_context);
sn_launchee_context_unref(sn_context);
sn_display_unref(sn_display);
}
gtk_widget_destroy(hack);
gtk_widget_destroy(hack);
}
#endif /* HAVE_STARTUP_NOTIFICATION */
void sylpheed_gtk_idle(void)
{
}
#endif /* HAVE_STARTUP_NOTIFICATION */
void sylpheed_gtk_idle(void)
{
- while(gtk_events_pending())
+ while(gtk_events_pending()) {
GtkWidget *window = NULL;
if (alertpanel(_("Migration of configuration"),
message,
GtkWidget *window = NULL;
if (alertpanel(_("Migration of configuration"),
message,
- GTK_STOCK_NO, GTK_STOCK_YES, NULL) != G_ALERTALTERNATE)
+ GTK_STOCK_NO, GTK_STOCK_YES, NULL) != G_ALERTALTERNATE) {
window = label_window_create(_("Copying configuration..."));
GTK_EVENTS_FLUSH();
window = label_window_create(_("Copying configuration..."));
GTK_EVENTS_FLUSH();
gtk_widget_set_default_colormap(gdk_rgb_get_colormap());
gtk_widget_set_default_visual(gdk_rgb_get_visual());
gtk_widget_set_default_colormap(gdk_rgb_get_colormap());
gtk_widget_set_default_visual(gdk_rgb_get_visual());
- if (!g_thread_supported())
+ if (!g_thread_supported()) {
g_error(_("g_thread is not supported by glib.\n"));
g_error(_("g_thread is not supported by glib.\n"));
/* parse gtkrc files */
userrc = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".gtkrc-2.0",
/* parse gtkrc files */
userrc = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".gtkrc-2.0",
#ifdef G_OS_UNIX
signal(SIGPIPE, SIG_IGN);
#endif
#ifdef G_OS_UNIX
signal(SIGPIPE, SIG_IGN);
#endif
- if (cmd.online_mode == ONLINE_MODE_OFFLINE)
+ if (cmd.online_mode == ONLINE_MODE_OFFLINE) {
main_window_toggle_work_offline(mainwin, TRUE, FALSE);
main_window_toggle_work_offline(mainwin, TRUE, FALSE);
- if (cmd.online_mode == ONLINE_MODE_ONLINE)
+ }
+ if (cmd.online_mode == ONLINE_MODE_ONLINE) {
main_window_toggle_work_offline(mainwin, FALSE, FALSE);
main_window_toggle_work_offline(mainwin, FALSE, FALSE);
if (cmd.status_folders) {
g_ptr_array_free(cmd.status_folders, TRUE);
if (cmd.status_folders) {
g_ptr_array_free(cmd.status_folders, TRUE);
gtk_clist_thaw(GTK_CLIST(mainwin->folderview->ctree));
main_window_cursor_normal(mainwin);
gtk_clist_thaw(GTK_CLIST(mainwin->folderview->ctree));
main_window_cursor_normal(mainwin);
g_timeout_add(1000, defer_check_all, GINT_TO_POINTER(FALSE));
g_timeout_add(1000, defer_check_all, GINT_TO_POINTER(FALSE));
- else if (prefs_common.chk_on_startup)
+ } else if (prefs_common.chk_on_startup) {
g_timeout_add(1000, defer_check_all, GINT_TO_POINTER(TRUE));
g_timeout_add(1000, defer_check_all, GINT_TO_POINTER(TRUE));
+ } else if (cmd.receive) {
g_timeout_add(1000, defer_check, NULL);
g_timeout_add(1000, defer_check, NULL);
gtk_widget_grab_focus(folderview->ctree);
gtk_widget_grab_focus(folderview->ctree);
open_compose_new(cmd.compose_mailto, cmd.attach_files);
open_compose_new(cmd.compose_mailto, cmd.attach_files);
if (cmd.attach_files) {
ptr_array_free_strings(cmd.attach_files);
g_ptr_array_free(cmd.attach_files, TRUE);
cmd.attach_files = NULL;
}
if (cmd.attach_files) {
ptr_array_free_strings(cmd.attach_files);
g_ptr_array_free(cmd.attach_files, TRUE);
cmd.attach_files = NULL;
}
folder_subscribe(cmd.subscribe_uri);
folder_subscribe(cmd.subscribe_uri);
static void save_all_caches(FolderItem *item, gpointer data)
{
static void save_all_caches(FolderItem *item, gpointer data)
{
folder_item_write_cache(item);
}
folder_item_write_cache(item);
}
debug_print("shutting down\n");
inc_autocheck_timer_remove();
debug_print("shutting down\n");
inc_autocheck_timer_remove();
- if (prefs_common.clean_on_exit)
+ if (prefs_common.clean_on_exit) {
main_window_empty_trash(mainwin, prefs_common.ask_on_clean);
main_window_empty_trash(mainwin, prefs_common.ask_on_clean);
/* save prefs for opened folder */
/* save prefs for opened folder */
- if(mainwin->folderview->opened)
- {
+ if(mainwin->folderview->opened) {
FolderItem *item;
item = gtk_ctree_node_get_row_data(GTK_CTREE(mainwin->folderview->ctree), mainwin->folderview->opened);
FolderItem *item;
item = gtk_ctree_node_get_row_data(GTK_CTREE(mainwin->folderview->ctree), mainwin->folderview->opened);
gint i;
for (i = 1; i < argc; i++) {
gint i;
for (i = 1; i < argc; i++) {
- if (!strncmp(argv[i], "--receive-all", 13))
+ if (!strncmp(argv[i], "--receive-all", 13)) {
- else if (!strncmp(argv[i], "--receive", 9))
+ } else if (!strncmp(argv[i], "--receive", 9)) {
- else if (!strncmp(argv[i], "--compose", 9)) {
+ } else if (!strncmp(argv[i], "--compose", 9)) {
const gchar *p = argv[i + 1];
cmd.compose = TRUE;
cmd.compose_mailto = NULL;
if (p && *p != '\0' && *p != '-') {
const gchar *p = argv[i + 1];
cmd.compose = TRUE;
cmd.compose_mailto = NULL;
if (p && *p != '\0' && *p != '-') {
- if (!strncmp(p, "mailto:", 7))
+ if (!strncmp(p, "mailto:", 7)) {
cmd.compose_mailto = p + 7;
cmd.compose_mailto = p + 7;
i++;
}
} else if (!strncmp(argv[i], "--subscribe", 11)) {
i++;
}
} else if (!strncmp(argv[i], "--subscribe", 11)) {
gchar *file;
while (p && *p != '\0' && *p != '-') {
gchar *file;
while (p && *p != '\0' && *p != '-') {
+ if (!cmd.attach_files) {
cmd.attach_files = g_ptr_array_new();
cmd.attach_files = g_ptr_array_new();
- if (*p != G_DIR_SEPARATOR)
+ }
+ if (*p != G_DIR_SEPARATOR) {
file = g_strconcat(sylpheed_get_startup_dir(),
G_DIR_SEPARATOR_S,
p, NULL);
file = g_strconcat(sylpheed_get_startup_dir(),
G_DIR_SEPARATOR_S,
p, NULL);
g_ptr_array_add(cmd.attach_files, file);
i++;
p = argv[i + 1];
g_ptr_array_add(cmd.attach_files, file);
i++;
p = argv[i + 1];
cmd.status_full = TRUE;
while (p && *p != '\0' && *p != '-') {
cmd.status_full = TRUE;
while (p && *p != '\0' && *p != '-') {
- if (!cmd.status_full_folders)
+ if (!cmd.status_full_folders) {
cmd.status_full_folders =
g_ptr_array_new();
cmd.status_full_folders =
g_ptr_array_new();
g_ptr_array_add(cmd.status_full_folders,
g_strdup(p));
i++;
g_ptr_array_add(cmd.status_full_folders,
g_strdup(p));
i++;
cmd.compose = TRUE;
cmd.compose_mailto = NULL;
if (p && *p != '\0' && *p != '-') {
cmd.compose = TRUE;
cmd.compose_mailto = NULL;
if (p && *p != '\0' && *p != '-') {
- if (!strncmp(p, "mailto:", 7))
+ if (!strncmp(p, "mailto:", 7)) {
cmd.compose_mailto = p + 7;
cmd.compose_mailto = p + 7;
}
} else if (strstr(argv[i], "://")) {
const gchar *p = argv[i];
}
} else if (strstr(argv[i], "://")) {
const gchar *p = argv[i];
FolderItem *queue;
queue = folder_get_default_queue();
FolderItem *queue;
queue = folder_get_default_queue();
+ if (!queue) {
+ return -1;
+ }
folder_item_scan(queue);
return queue->total_msgs;
folder_item_scan(queue);
return queue->total_msgs;
- if (item->prefs->enable_processing)
- folder_item_apply_processing(item);
+ if (item->prefs->enable_processing) {
+ folder_item_apply_processing(item);
+ }
debug_print("done.\n");
STATUSBAR_POP(mainwin);
debug_print("done.\n");
STATUSBAR_POP(mainwin);
{
static gboolean firstrun = TRUE;
{
static gboolean firstrun = TRUE;
firstrun = FALSE;
/*!< Good idea to have the main window stored in a
firstrun = FALSE;
/*!< Good idea to have the main window stored in a
/* FIXME: Use something else to signal that we're
* in the original spawner, and not in a spawned
* child. */
/* FIXME: Use something else to signal that we're
* in the original spawner, and not in a spawned
* child. */
- if (!static_mainwindow)
+ if (!static_mainwindow) {
if (alertpanel(_("Queued messages"),
_("Some unsent messages are queued. Exit now?"),
GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL)
if (alertpanel(_("Queued messages"),
_("Some unsent messages are queued. Exit now?"),
GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL)
manage_window_focus_in(mainwin->window, NULL, NULL);
}
manage_window_focus_in(mainwin->window, NULL, NULL);
}
debug_print("another Sylpheed-Claws instance is already running.\n");
debug_print("another Sylpheed-Claws instance is already running.\n");
fd_write_all(uxsock, "receive_all\n", 12);
fd_write_all(uxsock, "receive_all\n", 12);
+ } else if (cmd.receive) {
fd_write_all(uxsock, "receive\n", 8);
fd_write_all(uxsock, "receive\n", 8);
- else if (cmd.compose && cmd.attach_files) {
+ } else if (cmd.compose && cmd.attach_files) {
gchar *str, *compose_str;
gint i;
gchar *str, *compose_str;
gint i;
- if (cmd.compose_mailto)
+ if (cmd.compose_mailto) {
compose_str = g_strdup_printf("compose_attach %s\n",
cmd.compose_mailto);
compose_str = g_strdup_printf("compose_attach %s\n",
cmd.compose_mailto);
compose_str = g_strdup("compose_attach\n");
compose_str = g_strdup("compose_attach\n");
fd_write_all(uxsock, compose_str, strlen(compose_str));
g_free(compose_str);
fd_write_all(uxsock, compose_str, strlen(compose_str));
g_free(compose_str);
} else if (cmd.compose) {
gchar *compose_str;
} else if (cmd.compose) {
gchar *compose_str;
- if (cmd.compose_mailto)
+ if (cmd.compose_mailto) {
compose_str = g_strdup_printf
("compose %s\n", cmd.compose_mailto);
compose_str = g_strdup_printf
("compose %s\n", cmd.compose_mailto);
compose_str = g_strdup("compose\n");
compose_str = g_strdup("compose\n");
fd_write_all(uxsock, compose_str, strlen(compose_str));
g_free(compose_str);
fd_write_all(uxsock, compose_str, strlen(compose_str));
g_free(compose_str);
#ifdef G_OS_UNIX
gchar *filename;
#ifdef G_OS_UNIX
gchar *filename;
- if (lock_socket < 0) return -1;
+ if (lock_socket < 0) {
+ return -1;
+ }
- if (lock_socket_tag > 0)
+ if (lock_socket_tag > 0) {
gdk_input_remove(lock_socket_tag);
gdk_input_remove(lock_socket_tag);
fd_close(lock_socket);
filename = get_socket_name();
g_unlink(filename);
fd_close(lock_socket);
filename = get_socket_name();
g_unlink(filename);
for (;;) {
fd_gets(sock, buf, sizeof(buf));
for (;;) {
fd_gets(sock, buf, sizeof(buf));
- if (!strncmp(buf, ".\n", 2)) break;
+ if (!strncmp(buf, ".\n", 2)) {
+ break;
+ }
- if (!folders) folders = g_ptr_array_new();
+ if (!folders) {
+ folders = g_ptr_array_new();
+ }
item = folder_find_item_from_identifier(buf);
item = folder_find_item_from_identifier(buf);
g_ptr_array_add(folders, item);
g_ptr_array_add(folders, item);
g_warning("no such folder: %s\n", buf);
g_warning("no such folder: %s\n", buf);
mailto = g_strdup(buf + strlen("compose_attach") + 1);
files = g_ptr_array_new();
while (fd_gets(sock, buf, sizeof(buf)) > 0) {
mailto = g_strdup(buf + strlen("compose_attach") + 1);
files = g_ptr_array_new();
while (fd_gets(sock, buf, sizeof(buf)) > 0) {
- if (buf[0] == '.' && buf[1] == '\n') break;
+ if (buf[0] == '.' && buf[1] == '\n') {
+ break;
+ }
strretchomp(buf);
g_ptr_array_add(files, g_strdup(buf));
}
strretchomp(buf);
g_ptr_array_add(files, g_strdup(buf));
}
gint res = procmsg_send_queue
(folder->queue, prefs_common.savemsg);
gint res = procmsg_send_queue
(folder->queue, prefs_common.savemsg);
alertpanel_error(_("Some errors occurred while sending queued messages."));
alertpanel_error(_("Some errors occurred while sending queued messages."));
folder_item_scan(folder->queue);
folder_item_scan(folder->queue);