← Back to branch summary

~ubuntu-branches/ubuntu/quantal/thunar/quantal-proposed

« back to all changes in this revision

Viewing changes to thunarx/thunarx-provider-factory.c

  • Committer: Bazaar Package Importer
  • Author(s): Yves-Alexis Perez, Yves-Alexis Perez, Lionel Le Folgoc
  • Date: 2011-10-14 18:47:39 UTC
  • mto: (2.1.7 experimental)
  • mto: This revision was merged to the branch mainline in revision 81.
  • Revision ID: james.westby@ubuntu.com-20111014184739-8trk4sn47wu6td2u
http://bugs.debian.org/645015
[ Yves-Alexis Perez ]
* debian/rules:
  - re-add -z,defs to LDFLAGS.
* debian/control:
  - only recommends thunar-volman on linux arches.

[ Lionel Le Folgoc ]
* debian/patches/01_support-non-multiarch-modules.patch: support modules
  installed in /usr/lib/$triplet and /usr/lib, to hopefully migrate smoothly
  thunar plugins to multiarch path over time without breakage. Closes: #645015

Show diffs side-by-side

added added

removed removed

Lines of Context:
thunarx/thunarx-provider-factory.c
145
145
  GList                 *modules = NULL;
146
146
  GList                 *lp;
147
147
  GDir                  *dp;
 
148
  gsize                  i;
 
149
  const gchar           *thunarx_dirs[] =
 
150
                          {
 
151
                            THUNARX_DIRECTORY,
 
152
                            "/usr/lib/thunarx-2"
 
153
                          };
148
154
 
149
 
  dp = g_dir_open (THUNARX_DIRECTORY, 0, NULL);
 
155
  /* Search both multiarch and non-multiarch THUNARX_DIRECTORYs */
 
156
  for (i = 0; i < G_N_ELEMENTS (thunarx_dirs); ++i)
 
157
  {
 
158
  dp = g_dir_open (thunarx_dirs[i], 0, NULL);
150
159
  if (G_LIKELY (dp != NULL))
151
160
    {
152
161
      /* determine the types for all existing plugins */
192
201
 
193
202
      g_dir_close (dp);
194
203
    }
 
204
  }
195
205
 
196
206
  return modules;
197
207
}