Remove 'External programs' logic

diff --git a/src/conf.c b/src/conf.c
index f8ba22bbc3c82b48b94ca8279157a9cb4f8f03b0..91d12d290af5e0ae4235b673249e70572d2effa9 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -27,8 +27,6 @@ void config_free(CConfig* config)
     g_free(config->homepage);
     g_free(config->locationSearch);
     g_free(config->panelPageholder);
-    g_datalist_clear(&config->protocols_commands);
-    g_ptr_array_free(config->protocols_names, TRUE);
     g_free(config);
 }
 
@@ -103,23 +101,6 @@ gboolean config_from_file(CConfig* config, const gchar* filename, GError** error
     #undef GET_INT
     #undef GET_STR
 
-    config->protocols_names = g_ptr_array_new();
-    g_datalist_init(&config->protocols_commands);
-    gchar** protocols;
-    if((protocols = g_key_file_get_keys(keyFile, "protocols", NULL, NULL)))
-    {
-        guint i;
-        for(i = 0; protocols[i] != NULL; i++)
-        {
-            gchar* sCommand = g_key_file_get_string(keyFile, "protocols"
-             , protocols[i], NULL);
-            g_ptr_array_add(config->protocols_names, (gpointer)protocols[i]);
-            g_datalist_set_data_full(&config->protocols_commands
-             , protocols[i], sCommand, g_free);
-        }
-        g_free(protocols);
-    }
-
     g_key_file_free(keyFile);
     return !(error && *error);
 }
@@ -169,15 +150,6 @@ gboolean config_to_file(CConfig* config, const gchar* filename, GError** error)
     g_key_file_set_integer(keyFile, "session", "WinPanelPos", config->winPanelPos);
     g_key_file_set_integer(keyFile, "session", "SearchEngine", config->searchEngine);
 
-    guint i;
-    for(i = 0; i < config->protocols_names->len; i++)
-    {
-        gchar* protocol = (gchar*)g_ptr_array_index(config->protocols_names, i);
-        gchar* command = g_datalist_get_data(&config->protocols_commands, protocol);
-        g_key_file_set_string(keyFile, "protocols", protocol, command);
-        g_free(protocol);
-    }
-
     gboolean saved = sokoke_key_file_save_to_file(keyFile, filename, error);
     g_key_file_free(keyFile);
 

diff --git a/src/conf.h b/src/conf.h
index 17a6b905cf5555581bbfef556a01f85d4c316adc..9a846079b5f4a106aa6fe9e4bf53982d52084a70 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -56,9 +56,6 @@ typedef struct _CConfig
     gint     winHeight;
     guint    winPanelPos;
     guint    searchEngine; // last selected search engine
-
-    GPtrArray* protocols_names;
-    GData*     protocols_commands;
 } CConfig;
 
 enum

diff --git a/src/helpers.c b/src/helpers.c
index c826f26f4b35e08de20541800a97ad6a48b058f3..851263bb15dbe9843116b49e59a961afe04ddeea 100644 (file)
--- a/src/helpers.c
+++ b/src/helpers.c
@@ -48,47 +48,6 @@ void show_error(const gchar* text, const gchar* text2, MidoriBrowser* browser)
     gtk_widget_destroy(dialog);
 }
 
-gboolean spawn_protocol_command(const gchar* protocol, const gchar* res)
-{
-    const gchar* command = g_datalist_get_data(&config->protocols_commands, protocol);
-    if(!command)
-        return FALSE;
-
-    // Create an argument vector
-    gchar* uriEscaped = g_shell_quote(res);
-    gchar* commandReady;
-    if(strstr(command, "%s"))
-        commandReady = g_strdup_printf(command, uriEscaped);
-    else
-        commandReady = g_strconcat(command, " ", uriEscaped, NULL);
-    gchar** argv; GError* error = NULL;
-    if(!g_shell_parse_argv(commandReady, NULL, &argv, &error))
-    {
-        // FIXME: Should we have a more specific message?
-        show_error(_("Could not run external program."), error->message, NULL);
-        g_error_free(error);
-        g_free(commandReady); g_free(uriEscaped);
-        return FALSE;
-    }
-
-    // Try to run the command
-    error = NULL;
-    gboolean success = g_spawn_async(NULL, argv, NULL
-     , (GSpawnFlags)G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD
-     , NULL, NULL, NULL, &error);
-    g_strfreev(argv);
-
-    if(!success)
-    {
-        // FIXME: Should we have a more specific message?
-        show_error(_("Could not run external program."), error->message, NULL);
-        g_error_free(error);
-    }
-    g_free(commandReady);
-    g_free(uriEscaped);
-    return TRUE;
-}
-
 GdkPixbuf* load_web_icon(const gchar* icon, GtkIconSize size, GtkWidget* widget)
 {
     g_return_val_if_fail(GTK_IS_WIDGET(widget), NULL);

diff --git a/src/helpers.h b/src/helpers.h
index 0db7400f71df5cc28f09a95192759ef487cfdf7c..92d0a6ab92902a74ca493b08ad6053f3aba422dc 100644 (file)
--- a/src/helpers.h
+++ b/src/helpers.h
@@ -25,9 +25,6 @@ radio_button_new(GtkRadioButton*, const gchar*);
 void
 show_error(const gchar*, const gchar*, MidoriBrowser*);
 
-gboolean
-spawn_protocol_command(const gchar*, const gchar*);
-
 GdkPixbuf*
 load_web_icon(const gchar*, GtkIconSize, GtkWidget*);
 

diff --git a/src/midori-browser.c b/src/midori-browser.c
index 3c6ad406ed2d76ffb07560fe85a33ee79b598c78..62f98b5b22363ec3bd0732d236f02f6763326cb2 100644 (file)
--- a/src/midori-browser.c
+++ b/src/midori-browser.c
@@ -220,21 +220,6 @@ _midori_browser_child_for_scrolled (MidoriBrowser* browser,
     return child;
 }
 
-static WebKitNavigationResponse
-midori_web_view_navigation_requested_cb (GtkWidget*            web_view,
-                                         WebKitWebFrame*       web_frame,
-                                         WebKitNetworkRequest* request)
-{
-    WebKitNavigationResponse response = WEBKIT_NAVIGATION_RESPONSE_ACCEPT;
-    // FIXME: This isn't the place for uri scheme handling
-    const gchar* uri = webkit_network_request_get_uri (request);
-    gchar* protocol = strtok (g_strdup (uri), ":");
-    if (spawn_protocol_command (protocol, uri))
-        response = WEBKIT_NAVIGATION_RESPONSE_IGNORE;
-    g_free (protocol);
-    return response;
-}
-
 static void
 _midori_browser_set_statusbar_text (MidoriBrowser* browser,
                                     const gchar*   text)
@@ -2812,8 +2797,6 @@ midori_browser_append_tab (MidoriBrowser* browser,
         }
 
         g_object_connect (widget,
-                          "signal::navigation-requested",
-                          midori_web_view_navigation_requested_cb, browser,
                           "signal::load-started",
                           midori_web_view_load_started_cb, browser,
                           "signal::load-committed",

diff --git a/src/prefs.c b/src/prefs.c
index ce5a9425bce19152e0c4cf9641f3a1f38f2caa00..1dea73edbbc8fa9e65eca1c5a866fd8aeffcfaee 100644 (file)
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -259,41 +259,6 @@ static void on_prefs_protocols_render_icon(GtkTreeViewColumn* column
     g_free(command);
 }
 
-static void on_prefs_protocols_edited(GtkCellRendererText* renderer
- , gchar* path, gchar* textNew, CPrefs* prefs)
-{
-    GtkTreeModel* model = gtk_tree_view_get_model(GTK_TREE_VIEW(prefs->treeview));
-    GtkTreeIter iter;
-    gtk_tree_model_get_iter_from_string(model, &iter, path);
-    gtk_list_store_set(GTK_LIST_STORE(model), &iter
-     , PROTOCOLS_COL_COMMAND, textNew, -1);
-    gchar* protocol;
-    gtk_tree_model_get(model, &iter, PROTOCOLS_COL_NAME, &protocol, -1);
-    g_datalist_set_data_full(&config->protocols_commands
-     , protocol, g_strdup(textNew), g_free);
-}
-
-static void on_prefs_protocols_add_clicked(GtkWidget* widget, CPrefs* prefs)
-{
-    gchar* protocol = gtk_combo_box_get_active_text(GTK_COMBO_BOX(prefs->combobox));
-    GtkTreeModel* liststore = gtk_tree_view_get_model(GTK_TREE_VIEW(prefs->treeview));
-    gtk_list_store_insert_with_values(GTK_LIST_STORE(liststore), NULL, G_MAXINT
-        , PROTOCOLS_COL_NAME, protocol
-        , PROTOCOLS_COL_COMMAND, "", -1);
-    g_ptr_array_add(config->protocols_names, (gpointer)protocol);
-    g_datalist_set_data_full(&config->protocols_commands
-     , protocol, g_strdup(""), g_free);
-    gtk_widget_set_sensitive(prefs->add, FALSE);
-}
-
-static void on_prefs_protocols_combobox_changed(GtkWidget* widget, CPrefs* prefs)
-{
-    gchar* protocol = gtk_combo_box_get_active_text(GTK_COMBO_BOX(widget));
-    gchar* command = (gchar*)g_datalist_get_data(&config->protocols_commands, protocol);
-    g_free(protocol);
-    gtk_widget_set_sensitive(prefs->add, command == NULL);
-}
-
 GtkWidget* prefs_preferences_dialog_new(MidoriBrowser* browser)
 {
     gchar* dialogTitle = g_strdup_printf(_("%s Preferences"), g_get_application_name());
@@ -687,75 +652,6 @@ GtkWidget* prefs_preferences_dialog_new(MidoriBrowser* browser)
     gtk_widget_set_sensitive(checkbutton, FALSE); //...
     SPANNED_ADD(checkbutton, 0, 2, 2, 3);
 
-    // Page "Programs"
-    PAGE_NEW(_("Programs"));
-    FRAME_NEW(_("External programs"));
-    TABLE_NEW(3, 2);
-    GtkWidget* treeview; GtkTreeViewColumn* column;
-    GtkCellRenderer* renderer_text; GtkCellRenderer* renderer_pixbuf;
-    GtkListStore* liststore = gtk_list_store_new(PROTOCOLS_COL_N
-     , G_TYPE_STRING, G_TYPE_STRING);
-    treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(liststore));
-    prefs->treeview = treeview;
-    renderer_text = gtk_cell_renderer_text_new();
-    renderer_pixbuf = gtk_cell_renderer_pixbuf_new();
-    column = gtk_tree_view_column_new_with_attributes(
-     _("Protocol"), renderer_text, "text", PROTOCOLS_COL_NAME, NULL);
-    gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column);
-    column = gtk_tree_view_column_new();
-    gtk_tree_view_column_set_title(column, _("Command"));
-    gtk_tree_view_column_pack_start(column, renderer_pixbuf, FALSE);
-    gtk_tree_view_column_set_cell_data_func(column, renderer_pixbuf
-     , (GtkTreeCellDataFunc)on_prefs_protocols_render_icon, prefs, NULL);
-    renderer_text = gtk_cell_renderer_text_new();
-    g_object_set(G_OBJECT(renderer_text), "editable", TRUE, NULL);
-    g_signal_connect(renderer_text, "edited"
-     , G_CALLBACK(on_prefs_protocols_edited), prefs);
-    gtk_tree_view_column_pack_start(column, renderer_text, TRUE);
-    gtk_tree_view_column_add_attribute(column, renderer_text, "text", PROTOCOLS_COL_COMMAND);
-    gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column);
-    GtkWidget* scrolled = gtk_scrolled_window_new(NULL, NULL);
-    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled)
-     , GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-    gtk_container_add(GTK_CONTAINER(scrolled), treeview);
-    gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
-    hbox = gtk_hbox_new(FALSE, 0);
-    gtk_box_pack_start(GTK_BOX(hbox), scrolled, TRUE, TRUE, 5);
-    guint i;
-    for(i = 0; i < config->protocols_names->len; i++)
-    {
-        gchar* protocol = (gchar*)g_ptr_array_index(config->protocols_names, i);
-        // TODO: We might want to determine 'default' programs somehow
-        // TODO: Any way to make it easier to add eg. only a mail client? O_o
-        const gchar* command = g_datalist_get_data(&config->protocols_commands, protocol);
-        gtk_list_store_insert_with_values(GTK_LIST_STORE(liststore), NULL, i
-         , PROTOCOLS_COL_NAME   , protocol
-         , PROTOCOLS_COL_COMMAND, command
-         , -1);
-    }
-    g_object_unref(liststore);
-    GtkWidget* vbox = gtk_vbox_new(FALSE, 4);
-    gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 4);
-    combobox = gtk_combo_box_new_text();
-    prefs->combobox = combobox;
-    sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox)
-     , "download", "ed2k", "feed", "ftp", "irc", "mailto"
-     , "news", "tel", "torrent", "view-source", NULL);
-    gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 1);
-    gtk_box_pack_start(GTK_BOX(vbox), combobox, FALSE, FALSE, 0);
-    button = gtk_button_new_from_stock(GTK_STOCK_ADD);
-    prefs->add = button;
-    g_signal_connect(combobox, "changed"
-     , G_CALLBACK(on_prefs_protocols_combobox_changed), prefs);
-    g_signal_connect(button, "clicked"
-     , G_CALLBACK(on_prefs_protocols_add_clicked), prefs);
-    gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
-    button = gtk_label_new(""); // This is an invisible separator
-    gtk_box_pack_start(GTK_BOX(vbox), button, TRUE, TRUE, 12);
-    button = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
-    gtk_widget_set_sensitive(button, FALSE); //...
-    gtk_box_pack_end(GTK_BOX(vbox), button, FALSE, FALSE, 0);
-    FILLED_ADD(hbox, 0, 2, 0, 2);
     gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox)
      , notebook, FALSE, FALSE, 4);
     gtk_widget_show_all(GTK_DIALOG(dialog)->vbox);