CLEANUP - remove old stuff

3 files changed, 2 insertions, 29 deletions

diff --git a/shell/callbacks.c b/shell/callbacks.c
index d2f4c0d9..af223e19 100644
--- a/shell/callbacks.c
+++ b/shell/callbacks.c
@@ -213,7 +213,7 @@ void cb_about()
         "DMI support based on code by Stewart Adam",
         "SCSI support based on code by Pascal F. Martin",
 	"",
-	"Translated by:"
+	"Translated by:",
 	"Alexander Münch",
 	"micrococo",
 	"yolanteng0",
@@ -224,7 +224,7 @@ void cb_about()
 	"Sabri Ünal",
 	"yetist",
         "",
-	"Artwork by:"
+	"Artwork by:",
         "Jakub Szypulka",
         "Tango Project",
         "The GNOME Project",
diff --git a/shell/shell.c b/shell/shell.c
index 81f3e084..57e5598c 100644
--- a/shell/shell.c
+++ b/shell/shell.c
@@ -818,9 +818,7 @@ void shell_init(GSList * modules)
 
     shell->tree->modules = modules ? modules : modules_load_all();
 
-#ifdef HAS_LIBSOUP
     check_for_updates();
-#endif
 
     g_slist_foreach(shell->tree->modules, shell_add_modules_to_gui, shell->tree);
     gtk_tree_view_expand_all(GTK_TREE_VIEW(shell->tree->view));
@@ -839,11 +837,7 @@ void shell_init(GSList * modules)
     shell_action_set_active("SidePaneAction", TRUE);
     shell_action_set_active("ToolbarAction", TRUE);
 
-#ifndef HAS_LIBSOUP
-    shell_action_set_enabled("SyncManagerAction", FALSE);
-#else
     shell_action_set_enabled("SyncManagerAction", sync_manager_count_entries() > 0);
-#endif
 
     /* Should select Computer Summary (note: not Computer/Summary) */
     g_idle_add(select_first_tree_item, NULL);
diff --git a/shell/syncmanager.c b/shell/syncmanager.c
index e034909e..86ba80a3 100644
--- a/shell/syncmanager.c
+++ b/shell/syncmanager.c
@@ -21,7 +21,6 @@
 #include "iconcache.h"
 #include "syncmanager.h"
 
-#ifdef HAS_LIBSOUP
 #include <libsoup/soup.h>
 
 #include <stdarg.h>
@@ -88,47 +87,30 @@ sync_dialog_netarea_start_actions(SyncDialog *sd, SyncNetAction *sna, gint n);
     if (!sna->error) {                                                         \
         sna->error = g_error_new(err_quark, code, message, ##__VA_ARGS__);     \
     }
-#endif /* HAS_LIBSOUP */
 
 gint sync_manager_count_entries(void)
 {
-#ifdef HAS_LIBSOUP
     return g_slist_length(entries);
-#else
-    return 0;
-#endif
 }
 
 void sync_manager_add_entry(SyncEntry *entry)
 {
-#ifdef HAS_LIBSOUP
     DEBUG("registering syncmanager entry ''%s''", entry->name);
 
     entry->selected = TRUE;
     entries = g_slist_append(entries, entry);
-#else
-    DEBUG("libsoup support is disabled.");
-#endif /* HAS_LIBSOUP */
 }
 
 void sync_manager_clear_entries(void)
 {
-#ifdef HAS_LIBSOUP
     DEBUG("clearing syncmanager entries");
 
     g_slist_free(entries);
     entries = NULL;
-#else
-    DEBUG("libsoup support is disabled.");
-#endif /* HAS_LIBSOUP */
 }
 
 void sync_manager_show(GtkWidget *parent)
 {
-#ifndef HAS_LIBSOUP
-    g_warning(_("HardInfo was compiled without libsoup support. (Network "
-                "Updater requires it.)"));
-#else  /* !HAS_LIBSOUP */
     SyncDialog *sd = sync_dialog_new(parent);
 
     err_quark = g_quark_from_static_string("syncmanager");
@@ -146,10 +128,8 @@ void sync_manager_show(GtkWidget *parent)
     }
 
     sync_dialog_destroy(sd);
-#endif /* HAS_LIBSOUP */
 }
 
-#ifdef HAS_LIBSOUP
 static gboolean _cancel_sync(GtkWidget *widget, gpointer data)
 {
     SyncDialog *sd = (SyncDialog *)data;
@@ -706,4 +686,3 @@ void sync_manager_update_on_startup(void)
         g_idle_add(sync_one, action);
     }
 }
-#endif /* HAS_LIBSOUP */