← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/midori/oneiric-updates

« back to all changes in this revision

Viewing changes to extensions/toolbar-editor.c

  • Committer: Bazaar Package Importer
  • Author(s): Artur Rona
  • Date: 2011-02-01 20:27:20 UTC
  • mfrom: (1.1.14 upstream) (3.3.3 sid)
  • Revision ID: james.westby@ubuntu.com-20110201202720-xobt459otz1m6sas
Tags: 0.3.0-1.1ubuntu1
* Merge from debian unstable.  Remaining changes:
  - debian/control, debian/rules:
    + Change build-depends from libwebkit-dev to libwebkitgtk-dev.
* debian/patches/desktop-scheme-handler-types:
  - Dropped, fixed upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
extensions/toolbar-editor.c
119
119
        GSList *list = NULL;
120
120
        MidoriWebSettings *settings;
121
121
 
122
 
        settings = katze_object_get_object(browser, "settings");
 
122
        settings = midori_browser_get_settings(browser);
123
123
        g_object_get(settings, "toolbar-items", &items, NULL);
124
 
        g_object_unref(settings);
125
124
 
126
125
        names = g_strsplit(items ? items : "", ",", 0);
127
126
        list = tb_editor_array_to_list((const gchar **) names);
356
355
 
357
356
        gtk_tree_model_foreach(GTK_TREE_MODEL(tbw->store_used), tb_editor_foreach_used, str);
358
357
 
359
 
        settings = katze_object_get_object(tbw->browser, "settings");
 
358
        settings = midori_browser_get_settings(tbw->browser);
360
359
        g_object_set(settings, "toolbar-items", str->str, NULL);
361
 
        g_object_unref(settings);
362
360
 
363
361
        g_string_free(str, TRUE);
364
362
}
592
590
{
593
591
        KatzeArray *browsers;
594
592
        MidoriBrowser *browser;
595
 
        guint i;
596
593
 
597
594
        browsers = katze_object_get_object(app, "browsers");
598
 
        i = 0;
599
 
        while ((browser = katze_array_get_nth_item(browsers, i++)))
 
595
        KATZE_ARRAY_FOREACH_ITEM (browser, browsers)
600
596
                tb_editor_app_add_browser_cb(app, browser, extension);
601
597
        g_signal_connect(app, "add-browser", G_CALLBACK(tb_editor_app_add_browser_cb), extension);
602
598
        g_object_unref(browsers);