← Back to branch summary

~ubuntu-branches/ubuntu/precise/inkscape/precise-updates

« back to all changes in this revision

Viewing changes to src/extension/init.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alex Valavanis
  • Date: 2010-09-12 19:44:58 UTC
  • mfrom: (1.1.12 upstream) (45.1.3 maverick)
  • Revision ID: james.westby@ubuntu.com-20100912194458-4sjwmbl7dlsrk5dc
Tags: 0.48.0-1ubuntu1
https://launchpad.net/bugs/628048
https://launchpad.net/bugs/401567
https://launchpad.net/bugs/456248
https://launchpad.net/bugs/463602
https://launchpad.net/bugs/591986
https://launchpad.net/bugs/513319
* Merge with Debian unstable (LP: #628048, LP: #401567, LP: #456248, 
  LP: #463602, LP: #591986)
* debian/control: 
  - Ubuntu maintainers
  - Promote python-lxml, python-numpy, python-uniconvertor to Recommends.
  - Demote pstoedit to Suggests (universe package).
  - Suggests ttf-dejavu instead of ttf-bitstream-vera (LP: #513319)
* debian/rules:
  - Run intltool-update on build (Ubuntu-specific).
  - Add translation domain to .desktop files (Ubuntu-specific).
* debian/dirs:
  - Add usr/share/pixmaps.  Allow inkscape.xpm installation
* drop 50-poppler-API.dpatch (now upstream)
* drop 51-paste-in-unwritable-directory.dpatch (now upstream) 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/extension/init.cpp
124
124
    /*
125
125
    gboolean missing=TRUE;
126
126
    for (GSList *list = extension_family; list; list = g_slist_next(list)) {
127
 
        g_assert( list->data );
 
127
        g_assert( list->data );
128
128
 
129
 
        Inkscape::Extension *extension;
130
 
        extension = reinterpret_cast<Inkscape::Extension *>(list->data);
 
129
        Inkscape::Extension *extension;
 
130
        extension = reinterpret_cast<Inkscape::Extension *>(list->data);
131
131
 
132
132
        if (!strcmp(extension->get_id(),pref)) missing=FALSE;
133
133
    }
185
185
    Internal::BlurEdge::init();
186
186
    Internal::GimpGrad::init();
187
187
    Internal::Grid::init();
188
 
        
 
188
 
189
189
    /* Raster Effects */
190
190
#ifdef WITH_IMAGE_MAGICK
191
191
    Internal::Bitmap::AdaptiveThreshold::init();
224
224
    Internal::Bitmap::Wave::init();
225
225
#endif /* WITH_IMAGE_MAGICK */
226
226
 
227
 
        Internal::Filter::Filter::filters_all();
 
227
    Internal::Filter::Filter::filters_all();
228
228
 
229
229
    /* Load search path for extensions */
230
230
    if (Inkscape::Extension::Extension::search_path.size() == 0)
231
231
    {
232
 
        Inkscape::Extension::Extension::search_path.push_back(profile_path("extensions"));
233
 
        
234
 
        Inkscape::Extension::Extension::search_path.push_back(g_strdup(INKSCAPE_EXTENSIONDIR));
 
232
        Inkscape::Extension::Extension::search_path.push_back(profile_path("extensions"));
 
233
 
 
234
        Inkscape::Extension::Extension::search_path.push_back(g_strdup(INKSCAPE_EXTENSIONDIR));
235
235
 
236
236
    }
237
237