← Back to branch summary

~ubuntu-branches/ubuntu/maverick/brasero/maverick

« back to all changes in this revision

Viewing changes to src/brasero-mime-filter.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Biebl
  • Date: 2010-07-04 15:14:24 UTC
  • mfrom: (1.3.7 upstream)
  • mto: This revision was merged to the branch mainline in revision 74.
  • Revision ID: james.westby@ubuntu.com-20100704151424-yg69h5sc55xgjp6h
Tags: 2.30.2-1
http://bugs.debian.org/568606
http://bugs.debian.org/465238
* New upstream release.
  - Fixes incorrectly reported size by passing correct arguments to
    g_signal_emit(). Closes: #568606
  - Fixes tracker search support. Closes: #465238
* debian/patches/90_relibtoolize.patch
  - Refresh for new upstream release.
* Switch to source formate 3.0 (quilt)
  - Add debian/source/format.
  - Drop Build-Depends on quilt.
  - Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk from debian/rules.
* Bump-Standards-Version to 3.9.0
  - Use architecture wildcard kfreebsd-any for the libcam-dev Build-Depends.
  - Use Breaks instead of Conflicts as recommended by the new policy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/brasero-mime-filter.c
219
219
        if (!item) {
220
220
                GIcon *icon;
221
221
                GtkTreeIter row;
 
222
                gchar *description;
222
223
                GtkTreeModel *model;
223
 
                const gchar *description;
224
224
 
225
225
                description = g_content_type_get_description (mime);
226
226
                icon = g_content_type_get_icon (mime);
247
247
                                    BRASERO_MIME_FILTER_FILTER_COL, item,
248
248
                                    -1);
249
249
                g_object_unref (icon);
 
250
                g_free (description);
250
251
 
251
252
                /* we check that the first entry at least is visible */
252
253
                if (gtk_combo_box_get_active (GTK_COMBO_BOX (filter->combo)) == -1