/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2011 Hiroyuki Yamamoto and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#ifdef HAVE_LIBSM
#include <X11/SM/SMlib.h>
#endif
-#ifdef USE_GNUTLS
-#include <pthread.h>
-#include <gcrypt.h>
-GCRY_THREAD_OPTION_PTHREAD_IMPL;
-#endif
#include "wizard.h"
#ifdef HAVE_STARTUP_NOTIFICATION
#ifdef HAVE_NETWORKMANAGER_SUPPORT
#include <NetworkManager.h>
#endif
+#ifdef HAVE_VALGRIND
+#include <valgrind.h>
+#endif
#include "claws.h"
#include "main.h"
#include "tags.h"
#include "hooks.h"
#include "menu.h"
+#include "quicksearch.h"
#ifdef HAVE_LIBETPAN
#include "imap-thread.h"
#include "nntp-thread.h"
#endif
#include "stock_pixmap.h"
-#ifdef HAVE_VALGRIND
-#include "valgrind.h"
-#endif
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
# include "ssl.h"
#endif
static gboolean went_offline_nm;
#endif
+#if !defined(NM_CHECK_VERSION)
+#define NM_CHECK_VERSION(x,y,z) 0
+#endif
+
#ifdef HAVE_DBUS_GLIB
static DBusGProxy *awn_proxy = NULL;
#endif
gboolean compose;
const gchar *compose_mailto;
GPtrArray *attach_files;
+ gboolean search;
+ const gchar *search_folder;
+ const gchar *search_type;
+ const gchar *search_request;
+ gboolean search_recursive;
gboolean status;
gboolean status_full;
GPtrArray *status_folders;
static gint lock_socket_remove (void);
static void lock_socket_input_cb (gpointer data,
gint source,
- GdkInputCondition condition);
+ GIOCondition condition);
static void open_compose_new (const gchar *address,
GPtrArray *attach_files);
gtk_widget_show(hack);
}
- xdisplay = GDK_DISPLAY();
+ xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
sn_display = sn_display_new(xdisplay,
sn_error_trap_push,
sn_error_trap_pop);
(*sc_ice_installed_handler) (connection);
}
static gboolean sc_process_ice_messages (GIOChannel *source,
- GIOCondition condition,
- gpointer data)
+ GIOCondition condition,
+ gpointer data)
{
IceConn connection = (IceConn) data;
IceProcessMessagesStatus status;
static void win32_open_log(void)
{
- if (is_file_exist("claws-win32.log")) {
- if (rename_force("claws-win32.log", "claws-win32.log.bak") < 0)
- FILE_OP_ERROR("claws-win32.log", "rename");
+ gchar *logfile = g_strconcat(g_get_tmp_dir(), G_DIR_SEPARATOR_S, "claws-win32.log", NULL);
+ gchar *oldlogfile = g_strconcat(g_get_tmp_dir(), G_DIR_SEPARATOR_S, "claws-win32.log.bak", NULL);
+
+ if (is_file_exist(logfile)) {
+ if (rename_force(logfile, oldlogfile) < 0)
+ FILE_OP_ERROR(logfile, "rename");
}
- win32_debug_fp = g_fopen("claws-win32.log", "w");
+ win32_debug_fp = g_fopen(logfile, "w");
+ g_free(logfile);
+ g_free(oldlogfile);
if (win32_debug_fp)
{
g_set_print_handler(win32_print_stdout);
else
g_print(" libetpan %d.%d\n", LIBETPAN_VERSION_MAJOR, LIBETPAN_VERSION_MINOR);
#endif
-#if USE_GNOMEPRINT
- if (show_debug_only)
- debug_print(" gnomeprint\n");
- else
- g_print(" gnomeprint\n");
-#endif
#if HAVE_LIBSM
if (show_debug_only)
debug_print(" libsm\n");
else
g_print(" NetworkManager\n");
#endif
-#if USE_OPENSSL
- if (show_debug_only)
- debug_print(" openssl\n");
- else
- g_print(" openssl\n");
-#endif
}
#ifdef HAVE_DBUS_GLIB
GtkUIManager *gui_manager = NULL;
GSList *plug_list = NULL;
gboolean never_ran = FALSE;
-
START_TIMING("startup");
sc_starting = TRUE;
sock_init();
/* check and create unix domain socket for remote operation */
-#ifdef G_OS_UNIX
lock_socket = prohibit_duplicate_launch();
if (lock_socket < 0) {
#ifdef HAVE_STARTUP_NOTIFICATION
return 0;
}
- if (cmd.status || cmd.status_full) {
+ if (cmd.status || cmd.status_full || cmd.search) {
puts("0 Claws Mail not running.");
lock_socket_remove();
return 0;
if (cmd.exit)
return 0;
-#endif
if (!g_thread_supported())
g_thread_init(NULL);
"/org/freedesktop/NetworkManager",
"org.freedesktop.NetworkManager");
if (nm_proxy) {
+#if NM_CHECK_VERSION(0,8,992)
+ dbus_g_proxy_add_signal(nm_proxy, "StateChanged", G_TYPE_UINT, G_TYPE_INVALID);
+ dbus_g_proxy_connect_signal(nm_proxy, "StateChanged",
+ G_CALLBACK(networkmanager_state_change_cb),
+ NULL,NULL);
+#else
dbus_g_proxy_add_signal(nm_proxy, "StateChange", G_TYPE_UINT, G_TYPE_INVALID);
dbus_g_proxy_connect_signal(nm_proxy, "StateChange",
G_CALLBACK(networkmanager_state_change_cb),
NULL,NULL);
+#endif
}
#endif
install_dbus_status_handler();
hildon_program = HILDON_PROGRAM(hildon_program_get_instance());
static_osso_context = osso_context;
#endif
- gtk_widget_set_default_colormap(gdk_rgb_get_colormap());
+ gtk_widget_set_default_colormap(
+ gdk_screen_get_system_colormap(
+ gdk_screen_get_default()));
gui_manager = gtkut_create_ui_manager();
/* If migration failed or the user didn't want to do it,
* we create a new one (and we'll hit wizard later).
*/
- if (r == FALSE && !is_dir_exist(RC_DIR) && make_dir(RC_DIR) < 0) {
+ if (r == FALSE && !is_dir_exist(RC_DIR)) {
+#ifdef G_OS_UNIX
+ if (copy_dir(SYSCONFDIR "/skel/.claws-mail", RC_DIR) < 0) {
+#endif
+ if (!is_dir_exist(RC_DIR) && make_dir(RC_DIR) < 0) {
#ifdef G_OS_WIN32
- win32_close_log();
+ win32_close_log();
#endif
- exit(1);
- }
+ exit(1);
+ }
+#ifdef G_OS_UNIX
+ }
+#endif
+ }
}
folder_item_update_freeze();
/* register the callback of unix domain socket input */
-#ifdef G_OS_UNIX
lock_socket_tag = claws_input_add(lock_socket,
- GDK_INPUT_READ | GDK_INPUT_EXCEPTION,
+ G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_PRI,
lock_socket_input_cb,
- mainwin);
-#endif
+ mainwin, TRUE);
prefs_account_init();
account_read_config_all();
+#ifdef HAVE_LIBETPAN
+ imap_main_init(prefs_common.skip_ssl_cert_check);
+ imap_main_set_timeout(prefs_common.io_timeout_secs);
+ nntp_main_init(prefs_common.skip_ssl_cert_check);
+#endif
/* If we can't read a folder list or don't have accounts,
* it means the configuration's not done. Either this is
* a brand new install, either a failed/refused migration.
if (claws_crashed())
main_window_popup(mainwin);
-#ifdef USE_GNUTLS
- gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
-#endif
-
-#ifdef HAVE_LIBETPAN
- imap_main_init(prefs_common.skip_ssl_cert_check);
- imap_main_set_timeout(prefs_common.io_timeout_secs);
- nntp_main_init(prefs_common.skip_ssl_cert_check);
-#endif
account_set_missing_folder();
folder_set_missing_folders();
folderview_set(folderview);
prefs_matcher_read_config();
+ quicksearch_set_search_strings(mainwin->summaryview->quicksearch);
/* make one all-folder processing before using claws */
main_window_cursor_wait(mainwin);
num_plugins++;
}
main_window_cursor_normal(mainwin);
+ main_window_popup(mainwin);
alertpanel_warning(ngettext(
"The following plugin failed to load. "
"Check the Plugins configuration "
static void exit_claws(MainWindow *mainwin)
{
gchar *filename;
+ gboolean have_connectivity;
sc_exiting = TRUE;
close_log_file(LOG_PROTOCOL);
close_log_file(LOG_DEBUG_FILTERING);
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+ have_connectivity = networkmanager_is_online(NULL);
+#else
+ have_connectivity = TRUE;
+#endif
#ifdef HAVE_LIBETPAN
- imap_main_done();
- nntp_main_done();
+ imap_main_done(have_connectivity);
+ nntp_main_done(have_connectivity);
#endif
/* delete crashfile */
if (!cmd.crash)
claws_done();
}
+#define G_STRING_APPEND_ENCODED_URI(gstring,source) \
+ { \
+ gchar tmpbuf[BUFFSIZE]; \
+ encode_uri(tmpbuf, BUFFSIZE, (source)); \
+ g_string_append((gstring), tmpbuf); \
+ }
+
+#define G_PRINT_EXIT(msg) \
+ { \
+ g_print(msg); \
+ exit(1); \
+ }
+
+static GString * parse_cmd_compose_from_file(const gchar *fn)
+{
+ GString *headers = g_string_new(NULL);
+ GString *body = g_string_new(NULL);
+ gchar *to = NULL;
+ gchar *h;
+ gchar *v;
+ gchar fb[BUFFSIZE];
+ FILE *fp;
+ gboolean isstdin;
+
+ if (fn == NULL || *fn == '\0')
+ G_PRINT_EXIT(_("Missing filename\n"));
+ isstdin = (*fn == '-' && *(fn + 1) == '\0');
+ if (isstdin)
+ fp = stdin;
+ else {
+ fp = g_fopen(fn, "r");
+ if (!fp)
+ G_PRINT_EXIT(_("Cannot open filename for reading\n"));
+ }
+
+ while (fgets(fb, sizeof(fb), fp)) {
+ gchar *tmp;
+ strretchomp(fb);
+ if (*fb == '\0')
+ break;
+ h = fb;
+ while (*h && *h != ':') { ++h; } /* search colon */
+ if (*h == '\0')
+ G_PRINT_EXIT(_("Malformed header\n"));
+ v = h + 1;
+ while (*v && *v == ' ') { ++v; } /* trim value start */
+ *h = '\0';
+ tmp = g_ascii_strdown(fb, -1); /* get header name */
+ if (!strcmp(tmp, "to")) {
+ if (to != NULL)
+ G_PRINT_EXIT(_("Duplicated 'To:' header\n"));
+ to = g_strdup(v);
+ } else {
+ g_string_append_c(headers, '&');
+ g_string_append(headers, tmp);
+ g_string_append_c(headers, '=');
+#if GLIB_CHECK_VERSION(2,16,0)
+ g_string_append_uri_escaped(headers, v, NULL, TRUE);
+#else
+ G_STRING_APPEND_ENCODED_URI(headers, v);
+#endif
+ }
+ g_free(tmp);
+ }
+ if (to == NULL)
+ G_PRINT_EXIT(_("Missing required 'To:' header\n"));
+ g_string_append(body, to);
+ g_free(to);
+ g_string_append(body, "?body=");
+ while (fgets(fb, sizeof(fb), fp)) {
+#if GLIB_CHECK_VERSION(2,16,0)
+ g_string_append_uri_escaped(body, fb, NULL, TRUE);
+#else
+ G_STRING_APPEND_ENCODED_URI(body, fb);
+#endif
+ }
+ if (!isstdin)
+ fclose(fp);
+ /* append the remaining headers */
+ g_string_append(body, headers->str);
+ g_string_free(headers, TRUE);
+
+ return body;
+}
+
+#undef G_STRING_APPEND_ENCODED_URI
+#undef G_PRINT_EXIT
+
static void parse_cmd_opt(int argc, char *argv[])
{
gint i;
cmd.receive_all = TRUE;
} else if (!strncmp(argv[i], "--receive", 9)) {
cmd.receive = TRUE;
+ } else if (!strncmp(argv[i], "--compose-from-file", 19)) {
+ const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
+
+ GString *mailto = parse_cmd_compose_from_file(p);
+ cmd.compose = TRUE;
+ cmd.compose_mailto = mailto->str;
+ i++;
} else if (!strncmp(argv[i], "--compose", 9)) {
- const gchar *p = argv[i + 1];
+ const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
cmd.compose = TRUE;
cmd.compose_mailto = NULL;
i++;
}
} else if (!strncmp(argv[i], "--subscribe", 11)) {
- const gchar *p = argv[i + 1];
+ const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
if (p && *p != '\0' && *p != '-') {
cmd.subscribe = TRUE;
cmd.subscribe_uri = p;
}
} else if (!strncmp(argv[i], "--attach", 8)) {
- const gchar *p = argv[i + 1];
+ const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
gchar *file = NULL;
while (p && *p != '\0' && *p != '-') {
}
g_ptr_array_add(cmd.attach_files, file);
i++;
- p = argv[i + 1];
+ p = (i+1 < argc)?argv[i+1]:NULL;
}
} else if (!strncmp(argv[i], "--send", 6)) {
cmd.send = TRUE;
g_print("Claws Mail version " VERSION "\n");
exit(0);
} else if (!strncmp(argv[i], "--status-full", 13)) {
- const gchar *p = argv[i + 1];
+ const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
cmd.status_full = TRUE;
while (p && *p != '\0' && *p != '-') {
g_ptr_array_add(cmd.status_full_folders,
g_strdup(p));
i++;
- p = argv[i + 1];
+ p = (i+1 < argc)?argv[i+1]:NULL;
}
} else if (!strncmp(argv[i], "--status", 8)) {
- const gchar *p = argv[i + 1];
+ const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
cmd.status = TRUE;
while (p && *p != '\0' && *p != '-') {
g_ptr_array_add(cmd.status_folders,
g_strdup(p));
i++;
- p = argv[i + 1];
+ p = (i+1 < argc)?argv[i+1]:NULL;
}
+ } else if (!strncmp(argv[i], "--search", 8)) {
+ cmd.search_folder = (i+1 < argc)?argv[i+1]:NULL;
+ cmd.search_type = (i+2 < argc)?argv[i+2]:NULL;
+ cmd.search_request = (i+3 < argc)?argv[i+3]:NULL;
+ const char* rec = (i+4 < argc)?argv[i+4]:NULL;
+ cmd.search_recursive = TRUE;
+ if (rec && (tolower(*rec)=='n' || tolower(*rec)=='f' || *rec=='0'))
+ cmd.search_recursive = FALSE;
+ if (cmd.search_folder && cmd.search_type && cmd.search_request)
+ cmd.search = TRUE;
} else if (!strncmp(argv[i], "--online", 8)) {
cmd.online_mode = ONLINE_MODE_ONLINE;
} else if (!strncmp(argv[i], "--offline", 9)) {
g_print(_("Usage: %s [OPTION]...\n"), base);
g_print("%s\n", _(" --compose [address] open composition window"));
+ g_print("%s\n", _(" --compose-from-file file\n"
+ " open composition window with data from given file;\n"
+ " use - as file name for reading from standard input;\n"
+ " content format: headers first (To: required) until an\n"
+ " empty line, then mail body until end of file."));
g_print("%s\n", _(" --subscribe [uri] subscribe to the given URI if possible"));
g_print("%s\n", _(" --attach file1 [file2]...\n"
" open composition window with specified files\n"
" attached"));
g_print("%s\n", _(" --receive receive new messages"));
g_print("%s\n", _(" --receive-all receive new messages of all accounts"));
+ g_print("%s\n", _(" --search folder type request [recursive]"));
+ g_print("%s\n", _(" searches mail"));
+ g_print("%s\n", _(" folder ex.: \"#mh/Mailbox/inbox\" or \"Mail\""));
+ g_print("%s\n", _(" type: s[ubject],f[rom],t[o],e[xtended],m[ixed] or g: tag"));
+ g_print("%s\n", _(" request: search string"));
+ g_print("%s\n", _(" recursive: false if arg. starts with 0, n, N, f or F"));
+
g_print("%s\n", _(" --send send all queued messages"));
g_print("%s\n", _(" --status [folder]... show the total number of messages"));
g_print("%s\n", _(" --status-full [folder]...\n"
exit(1);
} else if (!strncmp(argv[i], "--crash", 7)) {
cmd.crash = TRUE;
- cmd.crash_params = g_strdup(argv[i + 1]);
+ cmd.crash_params = g_strdup((i+1 < argc)?argv[i+1]:NULL);
i++;
} else if (!strncmp(argv[i], "--config-dir", sizeof "--config-dir" - 1)) {
g_print(RC_DIR "\n");
MainWindow *mainwin = (MainWindow *)data;
gchar *buf;
- g_return_if_fail(item);
+ cm_return_if_fail(item);
buf = g_strdup_printf(_("Processing (%s)..."),
item->path
? item->path
static gint prohibit_duplicate_launch(void)
{
gint uxsock;
+#ifdef G_OS_UNIX
gchar *path;
path = claws_get_socket_name();
claws_unlink(path);
return fd_open_unix(path);
}
-
+#else
+ HANDLE hmutex;
+
+ hmutex = CreateMutexA(NULL, FALSE, "ClawsMail");
+ if (!hmutex) {
+ debug_print("cannot create Mutex\n");
+ return -1;
+ }
+ if (GetLastError() != ERROR_ALREADY_EXISTS) {
+ uxsock = fd_open_inet(50216);
+ if (uxsock < 0)
+ return 0;
+ return uxsock;
+ }
+
+ uxsock = fd_connect_inet(50216);
+ if (uxsock < 0)
+ return -1;
+#endif
/* remote command mode */
debug_print("another Claws Mail instance is already running.\n");
gchar *str = g_strdup_printf("select %s\n", cmd.target);
fd_write_all(uxsock, str, strlen(str));
g_free(str);
+ } else if (cmd.search) {
+ gchar buf[BUFFSIZE];
+ gchar *str =
+ g_strdup_printf("search %s\n%s\n%s\n%c\n",
+ cmd.search_folder, cmd.search_type, cmd.search_request,
+ (cmd.search_recursive==TRUE)?'1':'0');
+ fd_write_all(uxsock, str, strlen(str));
+ g_free(str);
+ for (;;) {
+ fd_gets(uxsock, buf, sizeof(buf));
+ if (!strncmp(buf, ".\n", 2)) break;
+ fputs(buf, stdout);
+ }
} else {
+#ifndef G_OS_WIN32
gchar buf[BUFSIZ];
fd_write_all(uxsock, "get_display\n", 12);
memset(buf, 0, sizeof(buf));
uxsock = fd_connect_unix(path);
fd_write_all(uxsock, "popup\n", 6);
}
+#else
+ fd_write_all(uxsock, "popup\n", 6);
+#endif
}
fd_close(uxsock);
{
#ifdef G_OS_UNIX
gchar *filename;
-
+#endif
if (lock_socket < 0) {
return -1;
}
g_source_remove(lock_socket_tag);
}
fd_close(lock_socket);
+
+#ifdef G_OS_UNIX
filename = claws_get_socket_name();
claws_unlink(filename);
#endif
static void lock_socket_input_cb(gpointer data,
gint source,
- GdkInputCondition condition)
+ GIOCondition condition)
{
MainWindow *mainwin = (MainWindow *)data;
gint sock;
gchar buf[BUFFSIZE];
+ /* re-use the same quicksearch (& avoid matcher_list mem.leaks) */
+ static QuickSearch *quicksearch = NULL;
sock = fd_accept(source);
fd_gets(sock, buf, sizeof(buf));
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;
- }
strretchomp(buf);
+ if (!strcmp2(buf, "."))
+ break;
g_ptr_array_add(files, g_strdup(buf));
}
open_compose_new(mailto, files);
} else if (!strncmp(buf, "select ", 7)) {
const gchar *target = buf+7;
mainwindow_jump_to(target, TRUE);
+ } else if (!strncmp(buf, "search ", 7)) {
+ FolderItem* folderItem = NULL;
+ GSList *messages = NULL;
+ gchar *folder_name, *request;
+ QuickSearchType searchType = QUICK_SEARCH_EXTENDED;
+ gboolean recursive;
+
+ if (quicksearch==NULL)
+ quicksearch = quicksearch_new_nogui();
+
+ folder_name = g_strdup(buf+7);
+ strretchomp(folder_name);
+
+ if (fd_gets(sock, buf, sizeof(buf)) <= 0) {
+ g_free(folder_name);
+ folder_name=NULL;
+ }
+ searchType = quicksearch_type(buf);
+ if (fd_gets(sock, buf, sizeof(buf)) <= 0) {
+ g_free(folder_name);
+ folder_name=NULL;
+ }
+ request = g_strdup(buf);
+ strretchomp(request);
+
+ recursive = TRUE;
+ if (fd_gets(sock, buf, sizeof(buf)) > 0)
+ if (buf[0]=='0')
+ recursive = FALSE;
+
+ debug_print("search: %s %i %s %i\n",folder_name,searchType,request,recursive);
+
+ if (folder_name)
+ folderItem = folder_find_item_from_identifier(folder_name);
+ if (folder_name && folderItem == NULL) {
+ debug_print("Unknow folder item : '%s', searching folder\n",folder_name);
+ Folder* folder = folder_find_from_path(folder_name);
+ if (folder != NULL)
+ folderItem = FOLDER_ITEM(folder->node->data);
+ else
+ debug_print("Unknown folder: '%s'\n",folder_name);
+ } else {
+ debug_print("%s %s\n",folderItem->name, folderItem->path);
+ }
+ if (folderItem != NULL) {
+ quicksearch_set(quicksearch, searchType, request);
+ quicksearch_set_recursive(quicksearch, recursive);
+ search_msgs_in_folders(&messages, quicksearch, folderItem);
+ } else {
+ g_print("Folder '%s' not found.\n'", folder_name);
+ }
+
+ GSList *cur;
+ for (cur=messages; cur != NULL; cur = cur->next) {
+ MsgInfo* msg = (MsgInfo *)cur->data;
+ gchar *file = procmsg_get_message_file_path(msg);
+ fd_write_all(sock, file, strlen(file));
+ fd_write_all(sock, "\n", 1);
+ g_free(file);
+ }
+ fd_write_all(sock, ".\n", 2);
+
+ if (messages != NULL)
+ procmsg_msg_list_free(messages);
+ g_free(folder_name);
+ g_free(request);
} else if (!strncmp(buf, "exit", 4)) {
+ if (prefs_common.clean_on_exit && !prefs_common.ask_on_clean) {
+ procmsg_empty_all_trash();
+ }
app_will_exit(NULL, mainwin);
}
-
fd_close(sock);
+
}
static void open_compose_new(const gchar *address, GPtrArray *attach_files)
struct sigaction act;
int flags;
- mem_notify_fd = open("/dev/mem_notify", O_RDONLY|O_NONBLOCK);
+ mem_notify_fd = g_open("/dev/mem_notify", O_RDONLY|O_NONBLOCK, 0);
if (mem_notify_fd == -1) {
debug_print("/dev/mem_notify not available (%s)\n",
strerror(errno));
g_propagate_error(error, tmp_error);
return TRUE;
}
-
- return (state == NM_STATE_CONNECTED || state == NM_STATE_UNKNOWN);
+#if NM_CHECK_VERSION(0,8,992)
+ return (state == NM_STATE_CONNECTED_LOCAL ||
+ state == NM_STATE_CONNECTED_SITE ||
+ state == NM_STATE_CONNECTED_GLOBAL ||
+ state == NM_STATE_UNKNOWN);
+#else
+ return (state == NM_STATE_CONNECTED ||
+ state == NM_STATE_UNKNOWN);
+#endif
}
#endif
projects / claws.git / blobdiff