[gnome-commander] Removing remaining references to GnomeVFS, finally fixing #33
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander] Removing remaining references to GnomeVFS, finally fixing #33
- Date: Sat, 9 Oct 2021 10:00:38 +0000 (UTC)
commit aca5508f4d7710aaaf822c5be5173e1f2b39445f
Author: Uwe Scholz <u scholz83 gmx de>
Date: Sat Oct 9 11:30:32 2021 +0200
Removing remaining references to GnomeVFS, finally fixing #33
configure.ac | 26 -------------
data/gnome-commander.ebuild.in | 5 +--
data/gnome-commander.spec.in | 6 +--
libgcmd/libgcmd-deps.h | 2 -
src/Makefile.am | 7 +---
src/dialogs/gnome-cmd-con-dialog.cc | 59 ++++++++++++------------------
src/dialogs/gnome-cmd-file-props-dialog.cc | 1 -
src/dialogs/gnome-cmd-mkdir-dialog.cc | 2 -
src/gnome-cmd-con-device.cc | 1 -
src/gnome-cmd-con-list.cc | 13 ++-----
src/gnome-cmd-con-list.h | 2 -
src/gnome-cmd-con.cc | 4 --
src/gnome-cmd-con.h | 8 ----
src/gnome-cmd-data.cc | 9 +----
src/gnome-cmd-dir.cc | 5 ---
src/gnome-cmd-file-list.cc | 2 -
src/gnome-cmd-file-selector.cc | 14 -------
src/gnome-cmd-user-actions.cc | 2 -
src/main.cc | 3 --
19 files changed, 33 insertions(+), 138 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index cbc91842..01821aad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,6 @@ dnl ===================
GLIB_REQ=2.66.0
GMODULE_REQ=2.0.0
GTK_REQ=2.24.0
-GNOMEVFS_REQ=2.0.0
GIO_REQ=2.0
UNIQUE_REQ=0.9.3
EXIV2_REQ=0.14
@@ -47,7 +46,6 @@ POPPLER_REQ=0.18
AC_SUBST(GLIB_REQ)
AC_SUBST(GTK_REQ)
-AC_SUBST(GNOMEVFS_REQ)
AC_SUBST(GIO_REQ)
AC_SUBST(UNIQUE_REQ)
AC_SUBST(EXIV2_REQ)
@@ -77,13 +75,6 @@ PKG_CHECK_MODULES([GMODULE], [gmodule-2.0 >= ${GMODULE_REQ}])
dnl Check for gtk+
PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= ${GTK_REQ}])
-dnl Check for gnome-vfs
-PKG_CHECK_MODULES([GNOMEVFS], [gnome-vfs-2.0 >= ${GNOMEVFS_REQ}], have_gnomevfs=yes, have_gnomevfs=no)
-
-if test "x$have_gnomevfs" != "xyes"; then
- AC_MSG_ERROR([[gnome-vfs >= ${GNOMEVFS_REQ}] not found])
-fi
-
dnl Check for gio
PKG_CHECK_MODULES([GIO], [gio-2.0 >= ${GIO_REQ}])
@@ -100,22 +91,6 @@ else
AC_MSG_WARN([unique >= ${UNIQUE_REQ} not found, disabling unique support])
fi
-dnl Check for samba support
-AC_ARG_WITH(samba, [AS_HELP_STRING([--without-samba], [disable SAMBA support])])
-have_samba=no
-if test "x$with_samba" != "xno"; then
- if test "x$have_gnomevfs" != "xyes"; then
- have_samba=no
- else
- have_samba=yes
- fi
-fi
-if test "x$have_samba" = "xyes"; then
- AC_DEFINE(HAVE_SAMBA, 1, [Define to 1 if you have SAMBA support])
-fi
-AM_CONDITIONAL([HAVE_SAMBA],[test "x$have_samba" = "xyes"])
-
-
dnl Check for exiv2 support
AC_ARG_WITH(exiv2, [AS_HELP_STRING([--without-exiv2], [disable EXIF and IPTC support])])
have_exiv2=no
@@ -283,7 +258,6 @@ echo " CXXFLAGS : ${CXXFLAGS}"
echo " LDFLAGS : ${LDFLAGS}"
echo ""
echo " libunique support: ${have_unique}"
-echo " Samba support: ${have_samba}"
echo ""
echo "Optional file metadata support:"
echo ""
diff --git a/data/gnome-commander.ebuild.in b/data/gnome-commander.ebuild.in
index 72cde74a..f9f8d669 100644
--- a/data/gnome-commander.ebuild.in
+++ b/data/gnome-commander.ebuild.in
@@ -13,19 +13,17 @@ HOMEPAGE="https://gcmd.github.io/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="chm exif gsf pdf samba taglib test +unique"
+IUSE="chm exif gsf pdf taglib test +unique"
RESTRICT="!test? ( test )"
RDEPEND="
app-text/yelp-tools
>=dev-libs/glib-@GLIB_REQ@:2
- >=gnome-base/gnome-vfs-@GNOMEVFS_REQ@
>=x11-libs/gtk+-@GTK_REQ@:2
chm? ( dev-libs/chmlib )
exif? ( >=media-gfx/exiv2-@EXIV2_REQ@ )
gsf? ( >=gnome-extra/libgsf-@LIBGSF_REQ@ )
pdf? ( >=app-text/poppler-@POPPLER_REQ@ )
- samba? ( >=gnome-base/gnome-vfs-@GNOMEVFS_REQ@[samba] )
taglib? ( >=media-libs/taglib-@TAGLIB_REQ@ )
unique? ( >=dev-libs/libunique-@UNIQUE_REQ@:1 )
"
@@ -53,7 +51,6 @@ src_configure() {
$(use_with exif exiv2) \
$(use_with gsf libgsf) \
$(use_with pdf poppler) \
- $(use_with samba) \
$(use_with taglib) \
$(use_with unique)
}
diff --git a/data/gnome-commander.spec.in b/data/gnome-commander.spec.in
index 3dc6da09..303d97c0 100644
--- a/data/gnome-commander.spec.in
+++ b/data/gnome-commander.spec.in
@@ -42,14 +42,11 @@ BuildRequires: gettext >= 0.19.7
BuildRequires: glib2-devel >= @GLIB_REQ@
BuildRequires: gtk2-devel >= @GTK_REQ@
BuildRequires: gio-2.0
-BuildRequires: gnome-vfs2-devel >= @GNOMEVFS_REQ@
BuildRequires: yelp-tools
BuildRequires: perl(XML::Parser)
Requires: glib2 >= @GLIB_REQ@
Requires: gtk2 >= @GTK_REQ@
-Requires: gnome-vfs2 >= @GNOMEVFS_REQ@
-Requires: gnome-vfs2-smb >= @GNOMEVFS_REQ@
# For CentOS:
Requires: gnome-icon-theme-legacy >= 3.0
@@ -161,6 +158,9 @@ scrollkeeper-update -q || :
%{_datadir}/glib-2.0/schemas/org.gnome.%{name}.gschema.xml
%changelog
+* Thu Oct 07 2021 Uwe Scholz <u scholz83 gmx de>
+- remove gnome-vfs2 dependency
+
* Thu Dec 20 2020 Uwe Scholz <u scholz83 gmx de>
- add explicit gio-2.0 dependency
diff --git a/libgcmd/libgcmd-deps.h b/libgcmd/libgcmd-deps.h
index 68766ec6..9bc3526b 100644
--- a/libgcmd/libgcmd-deps.h
+++ b/libgcmd/libgcmd-deps.h
@@ -28,7 +28,5 @@
#include <gdk/gdkkeysyms.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gtk/gtk.h>
-#include <libgnomevfs/gnome-vfs.h>
-#include <libgnomevfs/gnome-vfs-mime-handlers.h>
extern GtkWidget *main_win_widget;
diff --git a/src/Makefile.am b/src/Makefile.am
index bfd13b96..565f9407 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -80,14 +80,10 @@ gnome_commander_SOURCES = \
tuple.h \
utils.h utils.cc \
utils-no-dependencies.h utils-no-dependencies.cc \
- widget-factory.h
-
-if HAVE_SAMBA
-gnome_commander_SOURCES += \
+ widget-factory.h \
gnome-cmd-con-smb.h gnome-cmd-con-smb.cc \
gnome-cmd-smb-net.h gnome-cmd-smb-net.cc \
gnome-cmd-smb-path.h gnome-cmd-smb-path.cc
-endif
gnome_commander_LDADD = \
$(top_builddir)/libgcmd/libgcmd.la \
@@ -96,7 +92,6 @@ gnome_commander_LDADD = \
intviewer/libgviewer.a \
$(GMODULE_LIBS) \
$(GTK_LIBS) \
- $(GNOMEVFS_LIBS) \
$(UNIQUE_LIBS) \
$(EXIV2_LIBS) \
$(TAGLIB_LIBS) \
diff --git a/src/dialogs/gnome-cmd-con-dialog.cc b/src/dialogs/gnome-cmd-con-dialog.cc
index 38d99bed..51c5fc95 100644
--- a/src/dialogs/gnome-cmd-con-dialog.cc
+++ b/src/dialogs/gnome-cmd-con-dialog.cc
@@ -192,14 +192,12 @@ void GnomeCmdConnectDialog::Private::setup_for_type()
show_domain = FALSE;
break;
-#ifdef HAVE_SAMBA
case CON_SMB:
show_share = TRUE;
show_port = FALSE;
show_user = TRUE;
show_domain = TRUE;
break;
-#endif
}
show_entry (table, server_entry, _("_Server:"), i);
@@ -446,9 +444,7 @@ static void gnome_cmd_connect_dialog_init (GnomeCmdConnectDialog *dialog)
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("SSH"));
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("FTP (with login)"));
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Public FTP"));
-#ifdef HAVE_SAMBA
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Windows share"));
-#endif
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("WebDAV (HTTP)"));
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Secure WebDAV (HTTPS)"));
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Custom location"));
@@ -563,44 +559,37 @@ gboolean gnome_cmd_connect_dialog_edit (GnomeCmdConRemote *server)
gtk_entry_set_text (GTK_ENTRY (dialog->priv->server_entry), host);
-#ifdef HAVE_SAMBA
- if (con->method==CON_SMB)
+ if (con->method==CON_SMB)
+ {
+ gchar **a = g_strsplit (path, "/", 3);
+ if (g_strv_length (a) > 2)
{
- gchar **a = g_strsplit (path, "/", 3);
-
- if (g_strv_length (a) > 2)
+ gtk_entry_set_text (GTK_ENTRY (dialog->priv->share_entry), a[1]);
+ gtk_entry_set_text (GTK_ENTRY (dialog->priv->folder_entry), a[2]);
+ }
+ else
+ gtk_entry_set_text (GTK_ENTRY (dialog->priv->folder_entry), path);
+ g_strfreev (a);
+ if (user_name)
+ {
+ a = g_strsplit (user_name, ";", 2);
+ if (g_strv_length (a) > 1)
{
- gtk_entry_set_text (GTK_ENTRY (dialog->priv->share_entry), a[1]);
- gtk_entry_set_text (GTK_ENTRY (dialog->priv->folder_entry), a[2]);
+ gtk_entry_set_text (GTK_ENTRY (dialog->priv->domain_entry), a[0]);
+ gtk_entry_set_text (GTK_ENTRY (dialog->priv->user_entry), a[1]);
}
else
- gtk_entry_set_text (GTK_ENTRY (dialog->priv->folder_entry), path);
-
- g_strfreev (a);
-
- if (user_name)
{
- a = g_strsplit (user_name, ";", 2);
- if (g_strv_length (a) > 1)
- {
- gtk_entry_set_text (GTK_ENTRY (dialog->priv->domain_entry), a[0]);
- gtk_entry_set_text (GTK_ENTRY (dialog->priv->user_entry), a[1]);
- }
- else
- {
- gtk_entry_set_text (GTK_ENTRY (dialog->priv->user_entry), user_name);
- }
- g_strfreev (a);
+ gtk_entry_set_text (GTK_ENTRY (dialog->priv->user_entry), user_name);
}
+ g_strfreev (a);
}
- else
- {
-#endif
- gtk_entry_set_text (GTK_ENTRY (dialog->priv->folder_entry), path);
- gtk_entry_set_text (GTK_ENTRY (dialog->priv->user_entry), user_name);
-#ifdef HAVE_SAMBA
- }
-#endif
+ }
+ else
+ {
+ gtk_entry_set_text (GTK_ENTRY (dialog->priv->folder_entry), path);
+ gtk_entry_set_text (GTK_ENTRY (dialog->priv->user_entry), user_name);
+ }
if (port)
gtk_entry_set_text (GTK_ENTRY (dialog->priv->port_entry), stringify(port).c_str());
diff --git a/src/dialogs/gnome-cmd-file-props-dialog.cc b/src/dialogs/gnome-cmd-file-props-dialog.cc
index 8e2116d9..7cf7985b 100644
--- a/src/dialogs/gnome-cmd-file-props-dialog.cc
+++ b/src/dialogs/gnome-cmd-file-props-dialog.cc
@@ -20,7 +20,6 @@
*/
#include <config.h>
-#include <libgnomevfs/gnome-vfs-mime-monitor.h>
#include "gnome-cmd-includes.h"
#include "gnome-cmd-dir.h"
diff --git a/src/dialogs/gnome-cmd-mkdir-dialog.cc b/src/dialogs/gnome-cmd-mkdir-dialog.cc
index f2ee5e60..0e3b2b85 100644
--- a/src/dialogs/gnome-cmd-mkdir-dialog.cc
+++ b/src/dialogs/gnome-cmd-mkdir-dialog.cc
@@ -47,7 +47,6 @@ GSList *make_gfile_list (GnomeCmdDir *dir, string filename)
filename.erase(0,1);
}
-#ifdef HAVE_SAMBA
// smb exception handling: test if we are in a samba share...
// if not - change filename so that we can get a proper error message
auto dir_gFile = gnome_cmd_dir_get_gfile (dir);
@@ -63,7 +62,6 @@ GSList *make_gfile_list (GnomeCmdDir *dir, string filename)
}
g_free(uriScheme);
g_object_unref (dir_gFile);
-#endif
GSList *gFile_list = NULL;
diff --git a/src/gnome-cmd-con-device.cc b/src/gnome-cmd-con-device.cc
index 901d6f66..ba3811fe 100644
--- a/src/gnome-cmd-con-device.cc
+++ b/src/gnome-cmd-con-device.cc
@@ -23,7 +23,6 @@
#include <stdlib.h>
#include <sys/types.h>
#include <sys/wait.h>
-#include <libgnomevfs/gnome-vfs-volume.h>
#include "gnome-cmd-includes.h"
#include "gnome-cmd-data.h"
diff --git a/src/gnome-cmd-con-list.cc b/src/gnome-cmd-con-list.cc
index c282dec0..7011c4ab 100644
--- a/src/gnome-cmd-con-list.cc
+++ b/src/gnome-cmd-con-list.cc
@@ -24,9 +24,7 @@
#include "gnome-cmd-includes.h"
#include "gnome-cmd-con-home.h"
#include "gnome-cmd-con-list.h"
-#ifdef HAVE_SAMBA
#include "gnome-cmd-con-smb.h"
-#endif
using namespace std;
@@ -44,9 +42,7 @@ struct GnomeCmdConList::Private
GList *quick_ftp_cons {nullptr};
GnomeCmdCon *home_con {nullptr};
-#ifdef HAVE_SAMBA
GnomeCmdCon *smb_con {nullptr};
-#endif
GList *all_cons;
};
@@ -149,13 +145,12 @@ static void init (GnomeCmdConList *con_list)
con_list->priv->update_lock = FALSE;
con_list->priv->home_con = gnome_cmd_con_home_new ();
-#ifdef HAVE_SAMBA
+
con_list->priv->smb_con = gnome_cmd_con_smb_new ();
-#endif
+
con_list->priv->all_cons = g_list_append (nullptr, con_list->priv->home_con);
-#ifdef HAVE_SAMBA
+
con_list->priv->all_cons = g_list_append (con_list->priv->all_cons, con_list->priv->smb_con);
-#endif
}
@@ -374,9 +369,7 @@ GnomeCmdCon *GnomeCmdConList::get_home()
return priv->home_con;
}
-#ifdef HAVE_SAMBA
GnomeCmdCon *GnomeCmdConList::get_smb()
{
return priv->smb_con;
}
-#endif
diff --git a/src/gnome-cmd-con-list.h b/src/gnome-cmd-con-list.h
index af26102d..d9029873 100644
--- a/src/gnome-cmd-con-list.h
+++ b/src/gnome-cmd-con-list.h
@@ -104,12 +104,10 @@ inline GnomeCmdCon *get_home_con ()
return gnome_cmd_con_list_get()->get_home();
}
-#ifdef HAVE_SAMBA
inline GnomeCmdCon *get_smb_con ()
{
return gnome_cmd_con_list_get()->get_smb();
}
-#endif
inline GList *get_remote_cons ()
{
diff --git a/src/gnome-cmd-con.cc b/src/gnome-cmd-con.cc
index 277b3238..83aaeb77 100644
--- a/src/gnome-cmd-con.cc
+++ b/src/gnome-cmd-con.cc
@@ -55,9 +55,7 @@ static GtkObjectClass *parent_class = nullptr;
const gchar *icon_name[] = {"gnome-fs-ssh", // CON_SSH
"gnome-fs-ftp", // CON_FTP
"gnome-fs-ftp", // CON_ANON_FTP
-#ifdef HAVE_SAMBA
"gnome-fs-smb", // CON_SMB
-#endif
"gnome-fs-web", // CON_DAV
"gnome-fs-web", // CON_DAVS
"gnome-fs-network", // CON_URI
@@ -637,7 +635,6 @@ string &__gnome_cmd_con_make_uri (string &s, const gchar *method, string &server
return s;
}
-#ifdef HAVE_SAMBA
std::string &gnome_cmd_con_make_smb_uri (std::string &uriString, std::string &server, std::string &share,
std::string &folder, std::string &domain, std::string &user, std::string &password)
{
user = stringify (g_strescape (user.c_str(), nullptr));
@@ -672,4 +669,3 @@ std::string &gnome_cmd_con_make_smb_uri (std::string &uriString, std::string &se
return uriString;
}
-#endif
diff --git a/src/gnome-cmd-con.h b/src/gnome-cmd-con.h
index eaae6073..91dc7348 100644
--- a/src/gnome-cmd-con.h
+++ b/src/gnome-cmd-con.h
@@ -45,9 +45,7 @@ enum ConnectionMethodID // Keep this order in sync with strings in gnome-
CON_SFTP = CON_SSH,
CON_FTP,
CON_ANON_FTP,
-#ifdef HAVE_SAMBA
CON_SMB,
-#endif
CON_DAV,
CON_DAVS,
CON_URI,
@@ -441,9 +439,7 @@ inline ConnectionMethodID gnome_cmd_con_get_scheme (const gchar *uriString)
g_str_equal (scheme, "sftp") ? CON_SSH :
g_str_equal (scheme, "dav") ? CON_DAV :
g_str_equal (scheme, "davs") ? CON_DAVS :
-#ifdef HAVE_SAMBA
g_str_equal (scheme, "smb") ? CON_SMB :
-#endif
CON_URI;
g_free(user);
@@ -485,9 +481,7 @@ inline std::string &gnome_cmd_con_make_ftp_uri (std::string &s, std::string &ser
return __gnome_cmd_con_make_uri (s, "ftp://", server, port, folder, user, password);
}
-#ifdef HAVE_SAMBA
std::string &gnome_cmd_con_make_smb_uri (std::string &s, std::string &server, std::string &share,
std::string &folder, std::string &domain, std::string &user, std::string &password);
-#endif
inline std::string &gnome_cmd_con_make_dav_uri (std::string &s, std::string &server, std::string &port,
std::string &folder, std::string &user, std::string &password)
{
@@ -508,9 +502,7 @@ inline std::string &gnome_cmd_con_make_uri (std::string &s, ConnectionMethodID m
case CON_SSH: return gnome_cmd_con_make_ssh_uri (s, server, port, folder, user, password);
-#ifdef HAVE_SAMBA
case CON_SMB: return gnome_cmd_con_make_smb_uri (s, server, share, folder, domain, user,
password);
-#endif
case CON_DAV: return gnome_cmd_con_make_dav_uri (s, server, port, folder, user, password);
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index efca8d32..bfd9410f 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -129,9 +129,8 @@ static void gcmd_settings_dispose (GObject *object)
static void on_bookmarks_changed ()
{
gnome_cmd_con_erase_bookmark (gnome_cmd_data.priv->con_list->get_home());
-#ifdef HAVE_SAMBA
+
gnome_cmd_con_erase_bookmark (gnome_cmd_data.priv->con_list->get_smb());
-#endif
gnome_cmd_data.load_bookmarks();
@@ -1547,10 +1546,8 @@ void GnomeCmdData::save_bookmarks()
hasBookmarks |= add_bookmark_to_gvariant_builder(gVariantBuilder, "Home", con);
// Samba
-#ifdef HAVE_SAMBA
con = priv->con_list->get_smb();
hasBookmarks |= add_bookmark_to_gvariant_builder(gVariantBuilder, "SMB", con);
-#endif
// Others
for (GList *i = gnome_cmd_con_list_get_all_remote (gnome_cmd_data.priv->con_list); i; i=i->next)
@@ -2160,13 +2157,11 @@ void GnomeCmdData::load_bookmarks()
}
else
{
-#ifdef HAVE_SAMBA
if (strcmp(bookmarkGroupName, "SMB") == 0)
{
gnomeCmdCon = gnome_cmd_con_list_get()->get_smb();
}
else
-#endif
gnomeCmdCon = nullptr;
}
}
@@ -3337,9 +3332,7 @@ void GnomeCmdData::load()
else
{
gnome_cmd_con_erase_bookmark (priv->con_list->get_home());
-#ifdef HAVE_SAMBA
gnome_cmd_con_erase_bookmark (priv->con_list->get_smb());
-#endif
advrename_defaults.profiles.clear();
}
diff --git a/src/gnome-cmd-dir.cc b/src/gnome-cmd-dir.cc
index 49ba7a1c..d816663f 100644
--- a/src/gnome-cmd-dir.cc
+++ b/src/gnome-cmd-dir.cc
@@ -24,9 +24,7 @@
#include "gnome-cmd-includes.h"
#include "gnome-cmd-dir.h"
#include "gnome-cmd-main-win.h"
-#ifdef HAVE_SAMBA
#include "gnome-cmd-con-smb.h"
-#endif
#include "gnome-cmd-data.h"
#include "gnome-cmd-con.h"
#include "gnome-cmd-file-collection.h"
@@ -643,8 +641,6 @@ GFile *gnome_cmd_dir_get_absolute_path_gfile (GnomeCmdDir *dir, string absolute_
{
g_return_val_if_fail (GNOME_CMD_IS_DIR (dir), nullptr);
-//ToDo: This has to be tested after the migration to GIO/gvfs is done
-#ifdef HAVE_SAMBA
// include workgroups and shares for smb uris
GFile *dir_gFile = gnome_cmd_dir_get_gfile (dir);
@@ -667,7 +663,6 @@ GFile *gnome_cmd_dir_get_absolute_path_gfile (GnomeCmdDir *dir, string absolute_
g_free(uriScheme);
g_object_unref (dir_gFile);
-#endif
GnomeCmdPath *path = gnome_cmd_con_create_path (dir->priv->con, absolute_filename.c_str());
auto gFile = gnome_cmd_con_create_gfile (dir->priv->con, path);
diff --git a/src/gnome-cmd-file-list.cc b/src/gnome-cmd-file-list.cc
index 199baa7b..8aaaf2a9 100644
--- a/src/gnome-cmd-file-list.cc
+++ b/src/gnome-cmd-file-list.cc
@@ -2959,7 +2959,6 @@ void GnomeCmdFileList::goto_directory(const gchar *in_dir)
if (dir[0] == '/')
new_dir = gnome_cmd_dir_new (con, gnome_cmd_con_create_path (con, dir));
else
-#ifdef HAVE_SAMBA
if (g_str_has_prefix (dir, "\\\\"))
{
GnomeCmdPath *path = gnome_cmd_con_create_path (get_smb_con (), dir);
@@ -2967,7 +2966,6 @@ void GnomeCmdFileList::goto_directory(const gchar *in_dir)
new_dir = gnome_cmd_dir_new (get_smb_con (), path);
}
else
-#endif
new_dir = gnome_cmd_dir_get_child (cwd, dir);
}
diff --git a/src/gnome-cmd-file-selector.cc b/src/gnome-cmd-file-selector.cc
index e442e86f..9ce5be4d 100644
--- a/src/gnome-cmd-file-selector.cc
+++ b/src/gnome-cmd-file-selector.cc
@@ -24,9 +24,7 @@
#include "gnome-cmd-includes.h"
#include "gnome-cmd-file-selector.h"
#include "gnome-cmd-con-list.h"
-#ifdef HAVE_SAMBA
#include "gnome-cmd-con-smb.h"
-#endif
#include "gnome-cmd-combo.h"
#include "gnome-cmd-data.h"
#include "gnome-cmd-cmdline.h"
@@ -367,12 +365,8 @@ static void create_con_buttons (GnomeCmdFileSelector *fs)
{
GnomeCmdCon *con = GNOME_CMD_CON (l->data);
-#ifdef HAVE_SAMBA
if (!gnome_cmd_con_is_open (con) && !GNOME_CMD_IS_CON_DEVICE (con) &&
!GNOME_CMD_IS_CON_SMB (con)) continue;
-#else
- if (!gnome_cmd_con_is_open (con) && !GNOME_CMD_IS_CON_DEVICE (con)) continue;
-#endif
GnomeCmdPixmap *pm = gnome_cmd_con_get_go_pixmap (con);
@@ -793,12 +787,8 @@ static void init (GnomeCmdFileSelector *fs)
{
auto con = static_cast<GnomeCmdCon*> (l->data);
-#ifdef HAVE_SAMBA
if (!gnome_cmd_con_is_open (con) && !GNOME_CMD_IS_CON_DEVICE (con)
&& !GNOME_CMD_IS_CON_SMB (con)) continue;
-#else
- if (!gnome_cmd_con_is_open (con) && !GNOME_CMD_IS_CON_DEVICE (con)) continue;
-#endif
string textstring {gnome_cmd_con_get_alias (con)};
string_size = get_string_pixel_size (textstring.c_str(), textstring.length());
@@ -1023,12 +1013,8 @@ void GnomeCmdFileSelector::update_connections()
gchar *text[3];
auto con = static_cast<GnomeCmdCon*> (l->data);
-#ifdef HAVE_SAMBA
if (!gnome_cmd_con_is_open (con) && !GNOME_CMD_IS_CON_DEVICE (con)
&& !GNOME_CMD_IS_CON_SMB (con)) continue;
-#else
- if (!gnome_cmd_con_is_open (con) && !GNOME_CMD_IS_CON_DEVICE (con)) continue;
-#endif
if (con == get_connection())
found_my_con = TRUE;
diff --git a/src/gnome-cmd-user-actions.cc b/src/gnome-cmd-user-actions.cc
index 0b525b62..1d3b2c14 100644
--- a/src/gnome-cmd-user-actions.cc
+++ b/src/gnome-cmd-user-actions.cc
@@ -1906,7 +1906,6 @@ void bookmarks_goto (GtkMenuItem *menuitem, gpointer bookmark_name)
g_warning ("[%s] Unknown bookmark name: '%s' - ignored", (char *) bookmark_name, name.c_str());
}
-#ifdef HAVE_SAMBA
else
if (group=="smb" || group=="samba")
{
@@ -1923,7 +1922,6 @@ void bookmarks_goto (GtkMenuItem *menuitem, gpointer bookmark_name)
g_warning ("[%s] Unknown bookmark name: '%s' - ignored", (char *) bookmark_name, name.c_str());
}
-#endif
else
g_warning ("[%s] Unsupported bookmark group: '%s' - ignored", (char *) bookmark_name,
group.c_str());
}
diff --git a/src/main.cc b/src/main.cc
index 7e368353..3eddb3e9 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -120,7 +120,6 @@ int main (int argc, char *argv[])
debug_flags = g_strdup("cdfgiklmnpstuvwyzx");
gdk_rgb_init ();
- gnome_vfs_init ();
gchar *conf_dir = get_package_config_dir();
if (!is_dir_existing(conf_dir))
@@ -186,8 +185,6 @@ int main (int argc, char *argv[])
}
#endif
- gnome_vfs_shutdown ();
-
#ifdef HAVE_UNIQUE
g_object_unref (app);
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]