← Back to branch summary

~midori/midori/trunk

« back to all changes in this revision

Viewing changes to midori/midori-extension.c

  • Committer: André Auzi
  • Date: 2013-09-17 19:34:23 UTC
  • mfrom: (6402 midori)
  • mto: This revision was merged to the branch mainline in revision 6406.
  • Revision ID: aauzi@free.fr-20130917193423-j3tqi7tt4b8afu41
merge lp:midori to fix conficts

Show diffs side-by-side

added added

removed removed

Lines of Context:
midori/midori-extension.c
559
559
        while (keys && (filename = keys[i++]))
560
560
            midori_extension_activate_gracefully (app, extension_path, filename, activate);
561
561
        /* FIXME need proper stock extension mechanism */
562
 
        GObject* extension = midori_extension_activate_gracefully (app, extension_path, "libtransfers." G_MODULE_SUFFIX, activate);
563
 
        g_assert (extension != NULL);
 
562
        g_assert (midori_extension_activate_gracefully (app, extension_path, "libtransfers." G_MODULE_SUFFIX, activate));
 
563
        g_assert (midori_extension_activate_gracefully (app, extension_path, "libapps." G_MODULE_SUFFIX, activate));
 
564
        g_assert (midori_extension_activate_gracefully (app, extension_path, "libdelayed-load." G_MODULE_SUFFIX, activate));
 
565
        g_assert (midori_extension_activate_gracefully (app, extension_path, "libtabby." G_MODULE_SUFFIX, activate));
564
566
    }
565
567
    else
566
568
    {
672
674
    if (katze_array_get_item_index (extensions, extension) >= 0)
673
675
        return;
674
676
    /* FIXME need proper stock extension mechanism */
675
 
    if (!strcmp (filename, "libtransfers." G_MODULE_SUFFIX))
 
677
    if (!strcmp (filename, "libtransfers." G_MODULE_SUFFIX)
 
678
     || !strcmp (filename, "libapps." G_MODULE_SUFFIX)
 
679
     || !strcmp (filename, "libdelayed-load." G_MODULE_SUFFIX)
 
680
     || !strcmp (filename, "libtabby." G_MODULE_SUFFIX))
676
681
        return;
677
682
 
678
683
    katze_array_add_item (extensions, extension);
684
689
    /* Signal that we want the extension to load and save */
685
690
    if (midori_extension_is_prepared (extension))
686
691
    {
 
692
        /* This is a sensible check but makes unit testing hard
687
693
        g_warn_if_fail (extension->priv->config_dir == NULL);
 
694
         */
688
695
        extension->priv->config_dir = midori_paths_get_extension_config_dir (filename);
689
696
    }
690
697
}