#include <glib.h>
#include <glib/gi18n.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkrc.h>
+#include <gtk/gtk.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
#ifdef G_OS_UNIX
# include <signal.h>
+# include <errno.h>
+# include <fcntl.h>
#endif
#ifdef HAVE_LIBSM
#include <X11/SM/SMlib.h>
-#include <fcntl.h>
+#endif
+#ifdef USE_GNUTLS
+#include <pthread.h>
+#include <gcrypt.h>
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
#endif
#include "wizard.h"
# include <gdk/gdkx.h>
#endif
-#ifdef HAVE_NETWORKMANAGER_SUPPORT
+#ifdef HAVE_DBUS_GLIB
#include <dbus/dbus-glib.h>
+#endif
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
#include <NetworkManager.h>
#endif
#include "news_gtk.h"
#include "matcher.h"
#include "tags.h"
+#include "hooks.h"
+#include "menu.h"
+
#ifdef HAVE_LIBETPAN
#include "imap-thread.h"
#include "nntp-thread.h"
#include <hildon-widgets/hildon-banner.h>
#include <hildon-widgets/hildon-program.h>
#endif
-#include <gtk/gtkmain.h>
#include <libosso.h>
#include <libgnomevfs/gnome-vfs-volume.h>
#include <libgnomevfs/gnome-vfs-volume-monitor.h>
static gboolean went_offline_nm;
#endif
+#ifdef HAVE_DBUS_GLIB
+static DBusGProxy *awn_proxy = NULL;
+#endif
+
gchar *prog_version;
gchar *argv0;
static void initial_processing (FolderItem *item, gpointer data);
static void quit_signal_handler (int sig);
static void install_basic_sighandlers (void);
+#if (defined linux && defined SIGIO)
+static void install_memory_sighandler (void);
+#endif
static void exit_claws (MainWindow *mainwin);
#ifdef HAVE_NETWORKMANAGER_SUPPORT
* if we have been launched from a menu.
* We have to display a window, so let it be very little */
hack = gtk_window_new(GTK_WINDOW_POPUP);
- gtk_widget_set_uposition(hack, 0, 0);
+ gtk_window_move(GTK_WINDOW(hack), 0, 0);
gtk_widget_set_size_request(hack, 1, 1);
gtk_widget_show(hack);
}
gint r = 0;
GtkWidget *window = NULL;
GtkWidget *keep_backup_chk;
- GtkTooltips *tips = gtk_tooltips_new();
+ CLAWS_TIP_DECL();
gboolean backup = TRUE;
keep_backup_chk = gtk_check_button_new_with_label (_("Keep old configuration"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_backup_chk), TRUE);
- gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), keep_backup_chk,
+ CLAWS_SET_TIP(keep_backup_chk,
_("Keeping a backup will allow you to go back to an "
"older version, but may take a while if you have "
"cached IMAP or News data, and will take some extra "
- "room on your disk."),
- NULL);
+ "room on your disk."));
g_signal_connect(G_OBJECT(keep_backup_chk), "toggled",
G_CALLBACK(chk_update_val), &backup);
}
#endif
+static void main_dump_features_list(gboolean show_debug_only)
+/* display compiled-in features list */
+{
+ if (show_debug_only && !debug_get_mode())
+ return;
+
+ if (show_debug_only)
+ debug_print("runtime GTK+ %d.%d.%d / GLib %d.%d.%d\n",
+ gtk_major_version, gtk_minor_version, gtk_micro_version,
+ glib_major_version, glib_minor_version, glib_micro_version);
+ else
+ g_print("runtime GTK+ %d.%d.%d / GLib %d.%d.%d\n",
+ gtk_major_version, gtk_minor_version, gtk_micro_version,
+ glib_major_version, glib_minor_version, glib_micro_version);
+ if (show_debug_only)
+ debug_print("buildtime GTK+ %d.%d.%d / GLib %d.%d.%d\n",
+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION,
+ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
+ else
+ g_print("buildtime GTK+ %d.%d.%d / GLib %d.%d.%d\n",
+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION,
+ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
+
+ if (show_debug_only)
+ debug_print("Compiled-in features:\n");
+ else
+ g_print("Compiled-in features:\n");
+#if HAVE_LIBCOMPFACE
+ if (show_debug_only)
+ debug_print(" compface\n");
+ else
+ g_print(" compface\n");
+#endif
+#if USE_ENCHANT
+ if (show_debug_only)
+ debug_print(" aspell\n");
+ else
+ g_print(" aspell\n");
+#endif
+#if USE_GNUTLS
+ if (show_debug_only)
+ debug_print(" gnutls\n");
+ else
+ g_print(" gnutls\n");
+#endif
+#if INET6
+ if (show_debug_only)
+ debug_print(" ipv6\n");
+ else
+ g_print(" ipv6\n");
+#endif
+#if HAVE_ICONV
+ if (show_debug_only)
+ debug_print(" iconv\n");
+ else
+ g_print(" iconv\n");
+#endif
+#if USE_JPILOT
+ if (show_debug_only)
+ debug_print(" jpilot\n");
+ else
+ g_print(" jpilot\n");
+#endif
+#if USE_LDAP
+ if (show_debug_only)
+ debug_print(" ldap\n");
+ else
+ g_print(" ldap\n");
+#endif
+#if HAVE_LIBETPAN
+ if (show_debug_only)
+ debug_print(" libetpan %d.%d\n", LIBETPAN_VERSION_MAJOR, LIBETPAN_VERSION_MINOR);
+ 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(" libsm\n");
+#endif
+#if HAVE_NETWORKMANAGER_SUPPORT
+ if (show_debug_only)
+ debug_print(" NetworkManager\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
+static guint dbus_item_hook_id = -1;
+static guint dbus_folder_hook_id = -1;
+
+static void uninstall_dbus_status_handler(void)
+{
+ if(awn_proxy)
+ g_object_unref(awn_proxy);
+ awn_proxy = NULL;
+ if (dbus_item_hook_id != -1)
+ hooks_unregister_hook(FOLDER_ITEM_UPDATE_HOOKLIST, dbus_item_hook_id);
+ if (dbus_folder_hook_id != -1)
+ hooks_unregister_hook(FOLDER_UPDATE_HOOKLIST, dbus_folder_hook_id);
+}
+
+static void dbus_update(FolderItem *removed_item)
+{
+ guint new, unread, unreadmarked, marked, total;
+ guint replied, forwarded, locked, ignored, watched;
+ gchar *buf;
+ GError *error = NULL;
+
+ folder_count_total_msgs(&new, &unread, &unreadmarked, &marked, &total,
+ &replied, &forwarded, &locked, &ignored,
+ &watched);
+ if (removed_item) {
+ total -= removed_item->total_msgs;
+ new -= removed_item->new_msgs;
+ unread -= removed_item->unread_msgs;
+ }
+
+ if (new > 0) {
+ buf = g_strdup_printf("%d", new);
+ dbus_g_proxy_call(awn_proxy, "SetInfoByName", &error,
+ G_TYPE_STRING, "claws-mail",
+ G_TYPE_STRING, buf,
+ G_TYPE_INVALID, G_TYPE_INVALID);
+ g_free(buf);
+
+ } else {
+ dbus_g_proxy_call(awn_proxy, "UnsetInfoByName", &error, G_TYPE_STRING,
+ "claws-mail", G_TYPE_INVALID, G_TYPE_INVALID);
+ }
+ if (error) {
+ debug_print("%s", error->message);
+ g_error_free(error);
+ }
+}
+
+static gboolean dbus_status_update_folder_hook(gpointer source, gpointer data)
+{
+ FolderUpdateData *hookdata;
+ hookdata = source;
+ if (hookdata->update_flags & FOLDER_REMOVE_FOLDERITEM)
+ dbus_update(hookdata->item);
+ else
+ dbus_update(NULL);
+
+ return FALSE;
+}
+
+static gboolean dbus_status_update_item_hook(gpointer source, gpointer data)
+{
+ dbus_update(NULL);
+
+ return FALSE;
+}
+
+static void install_dbus_status_handler(void)
+{
+ GError *tmp_error = NULL;
+ DBusGConnection *connection = dbus_g_bus_get(DBUS_BUS_SESSION, &tmp_error);
+
+ if(!connection) {
+ /* If calling code doesn't do error checking, at least print some debug */
+ debug_print("Failed to open connection to session bus: %s\n",
+ tmp_error->message);
+ g_error_free(tmp_error);
+ return;
+ }
+ awn_proxy = dbus_g_proxy_new_for_name(connection,
+ "com.google.code.Awn",
+ "/com/google/code/Awn",
+ "com.google.code.Awn");
+ dbus_item_hook_id = hooks_register_hook (FOLDER_ITEM_UPDATE_HOOKLIST, dbus_status_update_item_hook, NULL);
+ if (dbus_item_hook_id == -1) {
+ g_warning(_("Failed to register folder item update hook"));
+ uninstall_dbus_status_handler();
+ return;
+ }
+
+ dbus_folder_hook_id = hooks_register_hook (FOLDER_UPDATE_HOOKLIST, dbus_status_update_folder_hook, NULL);
+ if (dbus_folder_hook_id == -1) {
+ g_warning(_("Failed to register folder update hook"));
+ uninstall_dbus_status_handler();
+ return;
+ }
+}
+#endif
+
int main(int argc, char *argv[])
{
#ifdef MAEMO
osso_context_t *osso_context;
osso_return_t result;
#endif
-#ifdef HAVE_NETWORKMANAGER_SUPPORT
+#ifdef HAVE_DBUS_GLIB
DBusGConnection *connection;
- GError *error;
- DBusGProxy *proxy;
+ GError *error;
+#endif
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+ DBusGProxy *nm_proxy;
#endif
gchar *userrc;
MainWindow *mainwin;
gint num_folder_class = 0;
gboolean asked_for_migration = FALSE;
gboolean start_done = TRUE;
+ GtkUIManager *gui_manager = NULL;
+ GSList *plug_list = NULL;
START_TIMING("startup");
-
+
sc_starting = TRUE;
#ifdef G_OS_WIN32
return 0;
}
- debug_print("GTK+ %d.%d.%d / GLib %d.%d.%d\n",
- gtk_major_version, gtk_minor_version, gtk_micro_version,
- glib_major_version, glib_minor_version, glib_micro_version);
- debug_print("Compiled-in features:\n");
-#if HAVE_LIBCOMPFACE
- debug_print(" compface\n");
-#endif
-#if USE_ASPELL
- debug_print(" aspell\n");
-#endif
-#if USE_GNUTLS
- debug_print(" gnutls\n");
-#endif
-#if INET6
- debug_print(" ipv6\n");
-#endif
-#if HAVE_ICONV
- debug_print(" iconv\n");
-#endif
-#if USE_JPILOT
- debug_print(" jpilot\n");
-#endif
-#if USE_LDAP
- debug_print(" ldap\n");
-#endif
-#if HAVE_LIBETPAN
- debug_print(" libetpan %d.%d\n", LIBETPAN_VERSION_MAJOR, LIBETPAN_VERSION_MINOR);
-#endif
-#if USE_GNOMEPRINT
- debug_print(" gnomeprint\n");
-#endif
-#if HAVE_LIBSM
- debug_print(" libsm\n");
-#endif
-#if HAVE_NETWORKMANAGER_SUPPORT
- debug_print(" NetworkManager\n");
-#endif
-#if USE_OPENSSL
- debug_print(" openssl\n");
-#endif
+ main_dump_features_list(TRUE);
prog_version = PROG_VERSION;
argv0 = g_strdup(argv[0]);
crash_install_handlers();
#endif
install_basic_sighandlers();
+#if (defined linux && defined SIGIO)
+ install_memory_sighandler();
+#endif
sock_init();
/* check and create unix domain socket for remote operation */
#ifdef HAVE_NETWORKMANAGER_SUPPORT
went_offline_nm = FALSE;
+ nm_proxy = NULL;
+#endif
+#ifdef HAVE_DBUS_GLIB
error = NULL;
- proxy = NULL;
- connection = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
+ connection = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
- if(!connection) {
+ if(!connection) {
debug_print("Failed to open connection to system bus: %s\n", error->message);
g_error_free(error);
}
else {
- proxy = dbus_g_proxy_new_for_name(connection,
- "org.freedesktop.NetworkManager",
- "/org/freedesktop/NetworkManager",
- "org.freedesktop.NetworkManager");
- dbus_g_proxy_add_signal(proxy,"StateChange", G_TYPE_UINT, G_TYPE_INVALID);
- dbus_g_proxy_connect_signal(proxy, "StateChange",
- G_CALLBACK(networkmanager_state_change_cb),
- NULL,NULL);
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+ nm_proxy = dbus_g_proxy_new_for_name(connection,
+ "org.freedesktop.NetworkManager",
+ "/org/freedesktop/NetworkManager",
+ "org.freedesktop.NetworkManager");
+ if (nm_proxy) {
+ 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
+ install_dbus_status_handler();
}
#endif
hildon_program = HILDON_PROGRAM(hildon_program_get_instance());
static_osso_context = osso_context;
#endif
- gdk_rgb_init();
gtk_widget_set_default_colormap(gdk_rgb_get_colormap());
- gtk_widget_set_default_visual(gdk_rgb_get_visual());
+
+ gui_manager = gtkut_create_ui_manager();
+
+ /* Create container for all the menus we will be adding */
+ MENUITEM_ADDUI("/", "Menus", NULL, GTK_UI_MANAGER_MENUBAR);
if (!g_thread_supported()) {
g_error(_("g_thread is not supported by glib.\n"));
exit(1);
}
#endif
- /* parse gtkrc files */
- userrc = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".gtkrc-2.0",
- NULL);
- gtk_rc_parse(userrc);
- g_free(userrc);
- userrc = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".gtk",
- G_DIR_SEPARATOR_S, "gtkrc-2.0", NULL);
- gtk_rc_parse(userrc);
- g_free(userrc);
#ifdef G_OS_WIN32
CHDIR_EXEC_CODE_RETURN_VAL_IF_FAIL(get_home_dir(), 1, win32_close_log(););
prefs_receive_init();
prefs_send_init();
tags_read_tags();
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
gtkaspell_checkers_init();
prefs_spelling_init();
#endif
mainwin = main_window_create();
#ifdef HAVE_NETWORKMANAGER_SUPPORT
- networkmanager_state_change_cb(proxy,NULL,mainwin);
+ networkmanager_state_change_cb(nm_proxy,NULL,mainwin);
#endif
#ifdef MAEMO
manage_window_focus_in(mainwin->window, NULL, NULL);
folderview = mainwin->folderview;
- gtk_clist_freeze(GTK_CLIST(mainwin->folderview->ctree));
+ gtk_cmclist_freeze(GTK_CMCLIST(mainwin->folderview->ctree));
folder_item_update_freeze();
/* register the callback of unix domain socket input */
#ifdef G_OS_UNIX
- lock_socket_tag = gdk_input_add(lock_socket,
+ lock_socket_tag = claws_input_add(lock_socket,
GDK_INPUT_READ | GDK_INPUT_EXCEPTION,
lock_socket_input_cb,
mainwin);
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);
prefs_matcher_read_config();
}
- if (plugin_get_unloaded_list() != NULL) {
+ if ((plug_list = plugin_get_unloaded_list()) != NULL) {
+ GSList *cur;
+ gchar *list = NULL;
+ gint num_plugins = 0;
+ for (cur = plug_list; cur; cur = cur->next) {
+ Plugin *plugin = (Plugin *)cur->data;
+ gchar *tmp = g_strdup_printf("%s\n%s",
+ list? list:"",
+ plugin_get_name(plugin));
+ g_free(list);
+ list = tmp;
+ num_plugins++;
+ }
main_window_cursor_normal(mainwin);
- alertpanel_warning(_("Some plugin(s) failed to load. "
+ alertpanel_warning(ngettext(
+ "The following plugin failed to load. "
"Check the Plugins configuration "
- "for more information."));
+ "for more information:\n%s",
+ "The following plugins failed to load. "
+ "Check the Plugins configuration "
+ "for more information:\n%s",
+ num_plugins),
+ list);
main_window_cursor_wait(mainwin);
+ g_free(list);
+ g_slist_free(plug_list);
}
plugin_load_standard_plugins ();
#endif
folder_item_update_thaw();
- gtk_clist_thaw(GTK_CLIST(mainwin->folderview->ctree));
+ gtk_cmclist_thaw(GTK_CMCLIST(mainwin->folderview->ctree));
main_window_cursor_normal(mainwin);
if (!cmd.target && prefs_common.goto_last_folder_on_startup &&
} else if (cmd.receive && !cmd.target) {
start_done = FALSE;
g_timeout_add(1000, defer_check, NULL);
- } else {
- gtk_widget_grab_focus(folderview->ctree);
- }
+ }
+ gtk_widget_grab_focus(folderview->ctree);
if (cmd.compose) {
open_compose_new(cmd.compose_mailto, cmd.attach_files);
osso_deinitialize(osso_context);
#endif
#ifdef HAVE_NETWORKMANAGER_SUPPORT
- if(proxy)
- g_object_unref(proxy);
+ if(nm_proxy)
+ g_object_unref(nm_proxy);
+#endif
+#ifdef HAVE_DBUS_GLIB
+ uninstall_dbus_status_handler();
if(connection)
dbus_g_connection_unref(connection);
#endif
debug_print("shutting down\n");
inc_autocheck_timer_remove();
- if (prefs_common.clean_on_exit && !emergency_exit) {
- main_window_empty_trash(mainwin, prefs_common.ask_on_clean);
- }
-
#ifdef HAVE_NETWORKMANAGER_SUPPORT
if (prefs_common.work_offline && went_offline_nm)
prefs_common.work_offline = FALSE;
if(mainwin->folderview->opened) {
FolderItem *item;
- item = gtk_ctree_node_get_row_data(GTK_CTREE(mainwin->folderview->ctree), mainwin->folderview->opened);
+ item = gtk_cmctree_node_get_row_data(GTK_CMCTREE(mainwin->folderview->ctree), mainwin->folderview->opened);
summary_save_prefs_to_folderitem(mainwin->folderview->summaryview, item);
prefs_common.last_opened_folder = folder_item_get_identifier(item);
}
#endif
/* delete crashfile */
if (!cmd.crash)
- g_unlink(get_crashfile_name());
+ claws_unlink(get_crashfile_name());
lock_socket_remove();
prefs_logging_done();
prefs_send_done();
tags_write_tags();
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
prefs_spelling_done();
gtkaspell_checkers_quit();
#endif
}
} else if (!strncmp(argv[i], "--send", 6)) {
cmd.send = TRUE;
+ } else if (!strncmp(argv[i], "--version-full", 14) ||
+ !strncmp(argv[i], "-V", 2)) {
+ g_print("Claws Mail version " VERSION "\n");
+ main_dump_features_list(FALSE);
+ exit(0);
} else if (!strncmp(argv[i], "--version", 9) ||
!strncmp(argv[i], "-v", 2)) {
g_print("Claws Mail version " VERSION "\n");
g_print("%s\n", _(" --debug debug mode"));
g_print("%s\n", _(" --help -h display this help and exit"));
g_print("%s\n", _(" --version -v output version information and exit"));
+ g_print("%s\n", _(" --version-full -V output version and built-in features information and exit"));
g_print("%s\n", _(" --config-dir output configuration directory"));
g_print("%s\n", _(" --alternate-config-dir [dir]\n"
" use specified configuration directory"));
cmd.target = argv[i+1];
} else if (i == 1 && argc == 2) {
/* only one parameter. Do something intelligent about it */
- if (strstr(argv[i], "@") && !strstr(argv[i], "://")) {
+ if ((strstr(argv[i], "@")||!strncmp(argv[i], "mailto:", 7)) && !strstr(argv[i], "://")) {
const gchar *p = argv[i];
cmd.compose = TRUE;
cmd.compose_mailto = p;
}
}
+ } else if (!strncmp(argv[i], "file://", 7)) {
+ cmd.target = argv[i];
+ } else if (!strncmp(argv[i], "?attach=file://", strlen("?attach=file://"))) {
+ cmd.compose = TRUE;
+ cmd.compose_mailto = argv[i];
} else if (strstr(argv[i], "://")) {
const gchar *p = argv[i];
if (p && *p != '\0' && *p != '-') {
}
} else if (!strcmp(argv[i], "--sync")) {
/* gtk debug */
+ } else if (is_dir_exist(argv[i]) || is_file_exist(argv[i])) {
+ cmd.target = argv[i];
} else {
g_print(_("Unknown option\n"));
exit(1);
{
MainWindow *mainwin = data;
+ if (gtk_main_level() == 0) {
+ debug_print("not even started\n");
+ return;
+ }
if (sc_exiting == TRUE) {
debug_print("exit pending\n");
return;
x_display = g_strdup(g_getenv("DISPLAY"));
if (uxsock < 0) {
- g_unlink(path);
+ claws_unlink(path);
return fd_open_unix(path);
}
}
if (lock_socket_tag > 0) {
- gdk_input_remove(lock_socket_tag);
+ g_source_remove(lock_socket_tag);
}
fd_close(lock_socket);
filename = claws_get_socket_name();
- g_unlink(filename);
+ claws_unlink(filename);
#endif
return 0;
#endif /* !G_OS_WIN32 */
}
+#if (defined linux && defined SIGIO)
+static int mem_notify_fd = 0;
+
+static gboolean clean_caches(gpointer unused)
+{
+ if (static_mainwindow && static_mainwindow->lock_count > 0)
+ return TRUE;
+ debug_print("/dev/mem_notify: callback: Freeing some memory now!\n");
+ folder_clean_cache_memory_force();
+ return FALSE;
+}
+
+static void memory_signal_handler(int sig)
+{
+ debug_print("/dev/mem_notify: Kernel says we should free up some memory!\n");
+ g_timeout_add(10, clean_caches, NULL);
+}
+
+static void install_memory_sighandler()
+{
+ sigset_t mask;
+ struct sigaction act;
+ int flags;
+
+ mem_notify_fd = open("/dev/mem_notify", O_RDONLY|O_NONBLOCK);
+ if (mem_notify_fd == -1) {
+ debug_print("/dev/mem_notify not available (%s)\n",
+ strerror(errno));
+ return;
+ }
+
+ fcntl(mem_notify_fd, F_SETOWN, getpid());
+ flags = fcntl(mem_notify_fd, F_GETFL);
+ fcntl(mem_notify_fd, flags|FASYNC);
+
+ sigemptyset(&mask);
+
+ sigaddset(&mask, SIGIO);
+
+ act.sa_handler = memory_signal_handler;
+ act.sa_mask = mask;
+ act.sa_flags = 0;
+
+ sigaction(SIGIO, &act, 0);
+
+ sigprocmask(SIG_UNBLOCK, &mask, 0);
+
+ debug_print("/dev/mem_notify: installed handler\n");
+}
+#endif /* linux && SIGIO */
+
#ifdef MAEMO
osso_context_t *get_osso_context(void)
{
#ifdef HAVE_NETWORKMANAGER_SUPPORT
static void networkmanager_state_change_cb(DBusGProxy *proxy, gchar *dev,
- gpointer data)
+ gpointer data)
{
MainWindow *mainWin;
mainWin = NULL;
- if(static_mainwindow)
+ if (static_mainwindow)
mainWin = static_mainwindow;
- else if(data)
+ else if (data)
mainWin = (MainWindow*)data;
- if(mainWin) {
+ if (!prefs_common.use_networkmanager)
+ return;
+
+ if (mainWin) {
GError *error;
gboolean online;
went_offline_nm = FALSE;
main_window_toggle_work_offline(mainWin, FALSE, FALSE);
debug_print("NetworkManager: Went online\n");
+ log_message(LOG_PROTOCOL, _("NetworkManager: network is online.\n"));
}
else if(!online) {
went_offline_nm = TRUE;
main_window_toggle_work_offline(mainWin, TRUE, FALSE);
debug_print("NetworkManager: Went offline\n");
+ log_message(LOG_PROTOCOL, _("NetworkManager: network is offline.\n"));
}
}
else {
gboolean networkmanager_is_online(GError **error)
{
DBusGConnection *connection;
- DBusGProxy *proxy;
- GError *tmp_error;
+ DBusGProxy *proxy;
+ GError *tmp_error = NULL;
gboolean retVal;
guint32 state;
+ if (!prefs_common.use_networkmanager)
+ return TRUE;
+
tmp_error = NULL;
proxy = NULL;
- connection = dbus_g_bus_get(DBUS_BUS_SYSTEM, &tmp_error);
+ connection = dbus_g_bus_get(DBUS_BUS_SYSTEM, &tmp_error);
- if(!connection) {
+ if(!connection) {
/* If calling code doesn't do error checking, at least print some debug */
if((error == NULL) || (*error == NULL))
debug_print("Failed to open connection to system bus: %s\n",
}
proxy = dbus_g_proxy_new_for_name(connection,
- "org.freedesktop.NetworkManager",
- "/org/freedesktop/NetworkManager",
- "org.freedesktop.NetworkManager");
+ "org.freedesktop.NetworkManager",
+ "/org/freedesktop/NetworkManager",
+ "org.freedesktop.NetworkManager");
- retVal = dbus_g_proxy_call(proxy,"state",&tmp_error,G_TYPE_INVALID,
- G_TYPE_UINT,&state,G_TYPE_INVALID);
+ retVal = dbus_g_proxy_call(proxy,"state",&tmp_error, G_TYPE_INVALID,
+ G_TYPE_UINT, &state, G_TYPE_INVALID);
if(proxy)
g_object_unref(proxy);
return TRUE;
}
- return (state == NM_STATE_CONNECTED);
+ return (state == NM_STATE_CONNECTED || state == NM_STATE_UNKNOWN);
}
#endif
projects / claws.git / blobdiff