← Back to branch summary

~ubuntu-branches/ubuntu/precise/gtk+2.0/precise-updates

« back to all changes in this revision

Viewing changes to gdk/x11/gdkapplaunchcontext-x11.c

  • Committer: Package Import Robot
  • Author(s): Ken VanDine
  • Date: 2011-12-01 11:40:06 UTC
  • mfrom: (1.14.11)
  • Revision ID: package-import@ubuntu.com-20111201114006-nrmf6qu3pg512veo
Tags: 2.24.8-0ubuntu1
https://launchpad.net/bugs/189494
https://launchpad.net/bugs/889019
* New upstream release 
  - gtkfilechooser should be more robust to malformed URIs
    in .gtk-bookmarks (LP: #189494)
* debian/patches/010_make_bg_changes_queue_repaint.patch
  - dropped it introduces performance regressions in some gtk2 
    apps (LP: #889019)
* 101_filechooser.patch, 000git_file_chooser.patch: dropped, upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
gdk/x11/gdkapplaunchcontext-x11.c
340
340
      if (icon == NULL)
341
341
        {
342
342
          icon = g_app_info_get_icon (info);
343
 
          g_object_ref (icon);
344
 
        }
345
 
 
346
 
      if (icon)
347
 
        icon_name = gicon_to_string (icon);
348
 
 
349
 
      g_object_unref (icon);
 
343
          if (icon != NULL)
 
344
            g_object_ref (icon);
 
345
        }
 
346
 
 
347
      if (icon != NULL)
 
348
        {
 
349
          icon_name = gicon_to_string (icon);
 
350
          g_object_unref (icon);
 
351
        }
350
352
    }
351
353
 
352
354
  binary_name = g_app_info_get_executable (info);