Fix bug 3895: Port from libnm-util/libnm-glib to libnm

[claws.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index c404a3deaa30ef0ae1cc2e544eeba63c290632be..c9590a7754147c7fa6f50047719e506a6f0b71b0 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -152,9 +152,6 @@
 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;
@@ -864,17 +861,17 @@ static void main_dump_features_list(gboolean show_debug_only)
 }
 
 #ifdef HAVE_DBUS_GLIB
-static guint dbus_item_hook_id = -1;
-static guint dbus_folder_hook_id = -1;
+static gulong dbus_item_hook_id = HOOK_NONE;
+static gulong dbus_folder_hook_id = HOOK_NONE;
 
 static void uninstall_dbus_status_handler(void)
 {
        if(awn_proxy)
                g_object_unref(awn_proxy);
        awn_proxy = NULL;
-       if (dbus_item_hook_id != -1)
+       if (dbus_item_hook_id != HOOK_NONE)
                hooks_unregister_hook(FOLDER_ITEM_UPDATE_HOOKLIST, dbus_item_hook_id);
-       if (dbus_folder_hook_id != -1)
+       if (dbus_folder_hook_id != HOOK_NONE)
                hooks_unregister_hook(FOLDER_UPDATE_HOOKLIST, dbus_folder_hook_id);
 }
 
@@ -948,14 +945,14 @@ static void install_dbus_status_handler(void)
                        "/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) {
+       if (dbus_item_hook_id == HOOK_NONE) {
                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) {
+       if (dbus_folder_hook_id == HOOK_NONE) {
                g_warning("Failed to register folder update hook");
                uninstall_dbus_status_handler();
                return;
@@ -987,7 +984,7 @@ int main(int argc, char *argv[])
        FolderView *folderview;
        GdkPixbuf *icon;
        gboolean crash_file_present = FALSE;
-       gint num_folder_class = 0;
+       guint num_folder_class = 0;
        gboolean asked_for_migration = FALSE;
        gboolean start_done = TRUE;
        GSList *plug_list = NULL;
@@ -1107,17 +1104,10 @@ int main(int argc, char *argv[])
                        "/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();
@@ -2096,8 +2086,7 @@ static void initial_processing(FolderItem *item, gpointer data)
                              : _("top level folder"));
        g_free(buf);
 
-       
-       if (item->prefs->enable_processing) {
+       if (folder_item_parent(item) != NULL && item->prefs->enable_processing) {
                item->processing_pending = TRUE;
                folder_item_apply_processing(item);
                item->processing_pending = FALSE;
@@ -2990,14 +2979,9 @@ gboolean networkmanager_is_online(GError **error)
                g_propagate_error(error, tmp_error);
                return TRUE;
        }
-#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