GNOME.org
 

[gnome-commander/ModerniseGcmd] Remove usage of libunique

commit 853bac7edb65441ee76dd96948baa66eb72685e4
Author: Uwe Scholz <uwescholz src gnome org>
Date:   Fri May 12 13:28:17 2017 +0200

    Remove usage of libunique

 configure.ac                               |   18 +----
 data/gnome-commander.ebuild.in             |    3 +-
 data/org.gnome.gnome-commander.gschema.xml |    7 --
 src/dialogs/gnome-cmd-options-dialog.cc    |   14 ----
 src/gnome-cmd-data.cc                      |   20 -----
 src/gnome-cmd-data.h                       |    3 -
 src/gnome-cmd-main-win.cc                  |    2 +-
 src/main.cc                                |  107 ++++++++--------------------
 8 files changed, 34 insertions(+), 140 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index abd9585..3c60302 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,6 @@ GNOME_REQ=2.0.0
 GNOMEUI_REQ=2.4.0
 GNOMEVFS_REQ=2.0.0
 GNOME_KEYRING_REQ=2.22
-UNIQUE_REQ=0.9.3
 PYTHON_REQ=2.5
 EXIV2_REQ=0.14
 TAGLIB_REQ=1.4
@@ -54,7 +53,6 @@ AC_SUBST(GNOME_REQ)
 AC_SUBST(GNOMEUI_REQ)
 AC_SUBST(GNOMEVFS_REQ)
 AC_SUBST(GNOME_KEYRING_REQ)
-AC_SUBST(UNIQUE_REQ)
 AC_SUBST(PYTHON_REQ)
 AC_SUBST(EXIV2_REQ)
 AC_SUBST(TAGLIB_REQ)
@@ -69,6 +67,9 @@ AC_SUBST(GTEST_REQ)
 dnl Check for glib
 PKG_CHECK_MODULES([GLIB], [glib-2.0 >= ${GLIB_REQ}])
 
+dnl Check for gio
+PKG_CHECK_MODULES([GIO], [gio-2.0 >= ${GLIB_REQ}])
+
 dnl Check for gobject
 PKG_CHECK_MODULES([GOBJECT],[gobject-2.0])
 
@@ -90,19 +91,6 @@ PKG_CHECK_MODULES([GNOMEVFS], [gnome-vfs-2.0 >= ${GNOMEVFS_REQ}], have_gnomevfs=
 dnl Check for gnome-keyring
 PKG_CHECK_MODULES(GNOME_KEYRING, [gnome-keyring-1 >= ${GNOME_KEYRING_REQ}])
 
-dnl Check for libUnique
-AC_ARG_WITH([unique], AS_HELP_STRING([--without-unique], [disable unique support]))
-AS_IF([test "x$with_unique" != "xno"],
-   [
-      PKG_CHECK_MODULES([UNIQUE], [unique-1.0 >= ${UNIQUE_REQ}], have_unique=yes, have_unique=no)
-   ],
-   [test "x$with_unique" = "xno"], [have_unique=no])
-if test "x$have_unique" = "xyes"; then
-   AC_DEFINE(HAVE_UNIQUE, 1, [Define to 1 if you have unique support])
-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
diff --git a/data/gnome-commander.ebuild.in b/data/gnome-commander.ebuild.in
index f1f34fd..7dd3656 100644
--- a/data/gnome-commander.ebuild.in
+++ b/data/gnome-commander.ebuild.in
@@ -14,12 +14,11 @@ HOMEPAGE="http://gcmd.github.io/";
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="chm exif gsf pdf python taglib samba test unique"
+IUSE="chm exif gsf pdf python taglib samba test"
 
 RDEPEND="
        app-text/gnome-doc-utils
        >=dev-libs/glib-@GLIB_REQ@:2
-       unique? ( >=dev-libs/libunique-@UNIQUE_REQ@:1 )
        gnome-base/gnome-keyring
        >=gnome-base/gnome-vfs-@GNOMEVFS_REQ@
        >=gnome-base/libgnome-@GNOME_REQ@
diff --git a/data/org.gnome.gnome-commander.gschema.xml b/data/org.gnome.gnome-commander.gschema.xml
index 51a6bd2..61bbbbf 100644
--- a/data/org.gnome.gnome-commander.gschema.xml
+++ b/data/org.gnome.gnome-commander.gschema.xml
@@ -346,13 +346,6 @@
             This option defines if directories will be marked when all items in a file pane should be marked.
         </description>
     </key>
-    <key name="allow-multiple-instances" type="b">
-      <default>false</default>
-      <summary>Allow multiple instances</summary>
-      <description>
-          This option defines if multiple instances are allowed.
-      </description>
-    </key>
     <key name="quick-search-exact-match-begin" type="b">
       <default>true</default>
       <summary>Quick search exact match begin</summary>
diff --git a/src/dialogs/gnome-cmd-options-dialog.cc b/src/dialogs/gnome-cmd-options-dialog.cc
index 7613bdb..35f8096 100644
--- a/src/dialogs/gnome-cmd-options-dialog.cc
+++ b/src/dialogs/gnome-cmd-options-dialog.cc
@@ -180,18 +180,6 @@ static GtkWidget *create_general_tab (GtkWidget *parent, GnomeCmdData::Options &
     gtk_box_pack_start (GTK_BOX (cat_box), check, FALSE, TRUE, 0);
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cfg.quick_search_exact_match_end);
 
-
-#ifdef HAVE_UNIQUE
-    // Multiple instances
-    cat_box = create_vbox (parent, FALSE, 0);
-    cat = create_category (parent, cat_box, _("Multiple instances"));
-    gtk_box_pack_start (GTK_BOX (vbox), cat, FALSE, TRUE, 0);
-
-    check = create_check (parent, _("Don’t start a new instance"), "multiple_instance_check");
-    gtk_box_pack_start (GTK_BOX (cat_box), check, FALSE, TRUE, 0);
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), !cfg.allow_multiple_instances);
-#endif
-
     // Save on exit
     cat_box = create_vbox (parent, FALSE, 0);
     cat = create_category (parent, cat_box, _("Save on exit"));
@@ -224,7 +212,6 @@ inline void store_general_options (GtkWidget *dialog, GnomeCmdData::Options &cfg
     GtkWidget *select_dirs = lookup_widget (dialog, "select_dirs");
     GtkWidget *case_sens_check = lookup_widget (dialog, "case_sens_check");
     GtkWidget *quick_search = lookup_widget (dialog, "quick_search");
-    GtkWidget *multiple_instance_check = lookup_widget (dialog, "multiple_instance_check");
     GtkWidget *qsearch_exact_match_begin = lookup_widget (dialog, "qsearch_exact_match_begin");
     GtkWidget *qsearch_exact_match_end = lookup_widget (dialog, "qsearch_exact_match_end");
     GtkWidget *save_dirs = lookup_widget (dialog, "save_dirs");
@@ -244,7 +231,6 @@ inline void store_general_options (GtkWidget *dialog, GnomeCmdData::Options &cfg
     cfg.select_dirs = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (select_dirs));
     cfg.case_sens_sort = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (case_sens_check));
     cfg.quick_search = (GnomeCmdQuickSearchShortcut) gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON 
(quick_search));
-    cfg.allow_multiple_instances = !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON 
(multiple_instance_check));
     cfg.quick_search_exact_match_begin = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON 
(qsearch_exact_match_begin));
     cfg.quick_search_exact_match_end = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON 
(qsearch_exact_match_end));
     cfg.save_dirs_on_exit = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (save_dirs));
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index 5d4c630..a856e80 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -734,14 +734,6 @@ static void on_always_download_changed()
     gnome_cmd_data.options.honor_expect_uris = always_download;
 }
 
-static void on_multiple_instances_changed()
-{
-    gboolean allow_multiple_instances;
-
-    allow_multiple_instances = g_settings_get_boolean (gnome_cmd_data.options.gcmd_settings->general, 
GCMD_SETTINGS_MULTIPLE_INSTANCES);
-    gnome_cmd_data.options.allow_multiple_instances = allow_multiple_instances;
-}
-
 static void on_use_internal_viewer_changed()
 {
     gboolean use_internal_viewer;
@@ -1182,11 +1174,6 @@ static void gcmd_connect_gsettings_signals(GcmdSettings *gs)
                       G_CALLBACK (on_always_download_changed),
                       NULL);
 
-    g_signal_connect (gs->general,
-                      "changed::allow-multiple-instances",
-                      G_CALLBACK (on_multiple_instances_changed),
-                      NULL);
-
     g_signal_connect (gs->programs,
                       "changed::use-internal-viewer",
                       G_CALLBACK (on_use_internal_viewer_changed),
@@ -1296,7 +1283,6 @@ GnomeCmdData::Options::Options(const Options &cfg)
     quick_search = cfg.quick_search;
     quick_search_exact_match_begin = cfg.quick_search_exact_match_begin;
     quick_search_exact_match_end = cfg.quick_search_exact_match_end;
-    allow_multiple_instances = cfg.allow_multiple_instances;
     save_dirs_on_exit = cfg.save_dirs_on_exit;
     save_tabs_on_exit = cfg.save_tabs_on_exit;
     save_dir_history_on_exit = cfg.save_dir_history_on_exit;
@@ -1357,7 +1343,6 @@ GnomeCmdData::Options &GnomeCmdData::Options::operator = (const Options &cfg)
         quick_search = cfg.quick_search;
         quick_search_exact_match_begin = cfg.quick_search_exact_match_begin;
         quick_search_exact_match_end = cfg.quick_search_exact_match_end;
-        allow_multiple_instances = cfg.allow_multiple_instances;
         save_dirs_on_exit = cfg.save_dirs_on_exit;
         save_tabs_on_exit = cfg.save_tabs_on_exit;
         save_dir_history_on_exit = cfg.save_dir_history_on_exit;
@@ -2929,9 +2914,6 @@ void GnomeCmdData::migrate_all_data_to_gsettings()
         //honor_expect_uris
         migrate_data_int_value_into_gsettings(gnome_cmd_data_get_bool ("/programs/honor_expect_uris", FALSE) 
? 1 : 0,
                                               options.gcmd_settings->programs, GCMD_SETTINGS_DONT_DOWNLOAD);
-        //allow_multiple_instances
-        migrate_data_int_value_into_gsettings(gnome_cmd_data_get_bool ("/programs/allow_multiple_instances", 
FALSE) ? 1 : 0,
-                                              options.gcmd_settings->general, 
GCMD_SETTINGS_MULTIPLE_INSTANCES);
         //use_internal_viewer
         migrate_data_int_value_into_gsettings(gnome_cmd_data_get_bool ("/programs/use_internal_viewer", 
TRUE) ? 1 : 0,
                                               options.gcmd_settings->programs, 
GCMD_SETTINGS_USE_INTERNAL_VIEWER);
@@ -3513,7 +3495,6 @@ void GnomeCmdData::load()
     mainmenu_visibility = g_settings_get_boolean (options.gcmd_settings->general, 
GCMD_SETTINGS_MAINMENU_VISIBILITY);
 
     options.honor_expect_uris = g_settings_get_boolean (options.gcmd_settings->programs, 
GCMD_SETTINGS_DONT_DOWNLOAD);
-    options.allow_multiple_instances = g_settings_get_boolean (options.gcmd_settings->general, 
GCMD_SETTINGS_MULTIPLE_INSTANCES);
     options.use_internal_viewer = g_settings_get_boolean (options.gcmd_settings->programs, 
GCMD_SETTINGS_USE_INTERNAL_VIEWER);
     options.quick_search = (GnomeCmdQuickSearchShortcut) g_settings_get_enum 
(options.gcmd_settings->general, GCMD_SETTINGS_QUICK_SEARCH_SHORTCUT);
     options.quick_search_exact_match_begin = g_settings_get_boolean (options.gcmd_settings->general, 
GCMD_SETTINGS_QUICK_SEARCH_EXACT_MATCH_BEGIN);
@@ -4116,7 +4097,6 @@ void GnomeCmdData::save()
     set_gsettings_when_changed      (options.gcmd_settings->general, GCMD_SETTINGS_CMDLINE_HISTORY_LENGTH, 
&(cmdline_history_length));
     set_gsettings_when_changed      (options.gcmd_settings->general, GCMD_SETTINGS_HORIZONTAL_ORIENTATION, 
&(horizontal_orientation));
     set_gsettings_when_changed      (options.gcmd_settings->general, GCMD_SETTINGS_GUI_UPDATE_RATE, 
&(gui_update_rate));
-    set_gsettings_when_changed      (options.gcmd_settings->general, GCMD_SETTINGS_MULTIPLE_INSTANCES, 
&(options.allow_multiple_instances));
     set_gsettings_enum_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_QUICK_SEARCH_SHORTCUT, 
options.quick_search);
 
     set_gsettings_when_changed      (options.gcmd_settings->programs, GCMD_SETTINGS_DONT_DOWNLOAD, 
&(options.honor_expect_uris));
diff --git a/src/gnome-cmd-data.h b/src/gnome-cmd-data.h
index 987cc66..cbf029f 100644
--- a/src/gnome-cmd-data.h
+++ b/src/gnome-cmd-data.h
@@ -92,7 +92,6 @@ GcmdSettings *gcmd_settings_new (void);
 #define GCMD_SETTINGS_MAIN_WIN_STATE                  "main-win-state"
 #define GCMD_SETTINGS_SELECT_DIRS                     "select-dirs"
 #define GCMD_SETTINGS_CASE_SENSITIVE                  "case-sensitive"
-#define GCMD_SETTINGS_MULTIPLE_INSTANCES              "allow-multiple-instances"
 #define GCMD_SETTINGS_QUICK_SEARCH_EXACT_MATCH_BEGIN  "quick-search-exact-match-begin"
 #define GCMD_SETTINGS_QUICK_SEARCH_EXACT_MATCH_END    "quick-search-exact-match-end"
 #define GCMD_SETTINGS_DEV_SKIP_MOUNTING               "dev-skip-mounting"
@@ -258,7 +257,6 @@ struct GnomeCmdData
         GnomeCmdQuickSearchShortcut  quick_search;
         gboolean                     quick_search_exact_match_begin;
         gboolean                     quick_search_exact_match_end;
-        gboolean                     allow_multiple_instances;
         gboolean                     save_dirs_on_exit;
         gboolean                     save_tabs_on_exit;
         gboolean                     save_dir_history_on_exit;
@@ -316,7 +314,6 @@ struct GnomeCmdData
                    quick_search(GNOME_CMD_QUICK_SEARCH_CTRL_ALT),
                    quick_search_exact_match_begin(TRUE),
                    quick_search_exact_match_end(FALSE),
-                   allow_multiple_instances(FALSE),
                    save_dirs_on_exit(FALSE),
                    save_tabs_on_exit(TRUE),
                    save_dir_history_on_exit(TRUE),
diff --git a/src/gnome-cmd-main-win.cc b/src/gnome-cmd-main-win.cc
index c2e2539..350c722 100644
--- a/src/gnome-cmd-main-win.cc
+++ b/src/gnome-cmd-main-win.cc
@@ -726,7 +726,7 @@ static void destroy (GtkObject *object)
     if (main_win->file_search_dlg)
         gtk_widget_destroy (*main_win->file_search_dlg);
 
-    gtk_main_quit ();
+    gtk_main_quit();
 }
 
 
diff --git a/src/main.cc b/src/main.cc
index bbdd3a8..20a020c 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -24,12 +24,13 @@ extern "C"
     void gnome_authentication_manager_init ();
 }
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <glib/gi18n.h>
 #include <locale.h>
-#ifdef HAVE_UNIQUE
-#include <unique/unique.h>
-#endif
+
 #include <libgnomeui/gnome-ui-init.h>
 
 #include "gnome-cmd-includes.h"
@@ -72,40 +73,10 @@ static const GOptionEntry options [] =
 };
 
 
-#ifdef HAVE_UNIQUE
-static UniqueResponse on_message_received (UniqueApp *app, UniqueCommand cmd, UniqueMessageData *msg, guint 
t, gpointer  user_data)
-{
-#if defined (__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wswitch-enum"
-#endif
-    switch (cmd)
-    {
-        case UNIQUE_ACTIVATE:
-            gtk_window_set_screen (*main_win, unique_message_data_get_screen (msg));
-            gtk_window_present_with_time (*main_win, t);
-            gdk_beep ();
-            break;
-
-        default:
-            break;
-    }
-#if defined (__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-
-    return UNIQUE_RESPONSE_OK;
-}
-#endif
-
-
 int main (int argc, char *argv[])
 {
     GnomeProgram *program;
     GOptionContext *option_context;
-#ifdef HAVE_UNIQUE
-    UniqueApp *app;
-#endif
 
     main_win = NULL;
 
@@ -147,67 +118,47 @@ int main (int argc, char *argv[])
     gnome_cmd_data.migrate_all_data_to_gsettings();
     gnome_cmd_data.load();
 
-#ifdef HAVE_UNIQUE
-    app = unique_app_new ("org.gnome.GnomeCommander", NULL);
-#endif
-
-#ifdef HAVE_UNIQUE
-    if (!gnome_cmd_data.options.allow_multiple_instances && unique_app_is_running (app))
-        unique_app_send_message (app, UNIQUE_ACTIVATE, NULL);
-    else
-    {
-#endif
-        if (start_dir_left)
-            
gnome_cmd_data.tabs[LEFT].push_back(make_pair(string(start_dir_left),make_triple(GnomeCmdFileList::COLUMN_NAME,GTK_SORT_ASCENDING,FALSE)));
+    if (start_dir_left)
+        
gnome_cmd_data.tabs[LEFT].push_back(make_pair(string(start_dir_left),make_triple(GnomeCmdFileList::COLUMN_NAME,GTK_SORT_ASCENDING,FALSE)));
 
-        if (start_dir_right)
-            
gnome_cmd_data.tabs[RIGHT].push_back(make_pair(string(start_dir_right),make_triple(GnomeCmdFileList::COLUMN_NAME,GTK_SORT_ASCENDING,FALSE)));
+    if (start_dir_right)
+        
gnome_cmd_data.tabs[RIGHT].push_back(make_pair(string(start_dir_right),make_triple(GnomeCmdFileList::COLUMN_NAME,GTK_SORT_ASCENDING,FALSE)));
 
-        gcmd_user_actions.set_defaults();
-        ls_colors_init ();
-        gnome_cmd_data.load_more();
+    gcmd_user_actions.set_defaults();
+    ls_colors_init ();
+    gnome_cmd_data.load_more();
 
-        gnome_authentication_manager_init ();
+    gnome_authentication_manager_init ();
 
-        gnome_cmd_style_create (gnome_cmd_data.options);
+    gnome_cmd_style_create (gnome_cmd_data.options);
 
-        main_win = new GnomeCmdMainWin;
-        main_win_widget = *main_win;
-#ifdef HAVE_UNIQUE
-        unique_app_watch_window (app, *main_win);
-        g_signal_connect (app, "message-received", G_CALLBACK (on_message_received), NULL);
-#endif
+    main_win = new GnomeCmdMainWin;
+    main_win_widget = *main_win;
 
-        gtk_widget_show (*main_win);
-        gcmd_owner.load_async();
+    gtk_widget_show (*main_win);
+    gcmd_owner.load_async();
 
-        gcmd_tags_init();
-        plugin_manager_init ();
+    gcmd_tags_init();
+    plugin_manager_init ();
 #ifdef HAVE_PYTHON
-        python_plugin_manager_init ();
+    python_plugin_manager_init ();
 #endif
 
-        gtk_main ();
+    gtk_main();
 
 #ifdef HAVE_PYTHON
-        python_plugin_manager_shutdown ();
-#endif
-        plugin_manager_shutdown ();
-        gcmd_tags_shutdown ();
-        gcmd_user_actions.shutdown();
-        gnome_cmd_data.save();
-        IMAGE_free ();
-
-        remove_temp_download_dir ();
-#ifdef HAVE_UNIQUE
-    }
+    python_plugin_manager_shutdown ();
 #endif
+    plugin_manager_shutdown ();
+    gcmd_tags_shutdown ();
+    gcmd_user_actions.shutdown();
+    gnome_cmd_data.save();
+    IMAGE_free ();
+
+    remove_temp_download_dir ();
 
     gnome_vfs_shutdown ();
 
-#ifdef HAVE_UNIQUE
-    g_object_unref (app);
-#endif
     g_object_unref (program);
     g_free (debug_flags);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]