← Back to branch summary

~ubuntu-branches/ubuntu/karmic/exo/karmic

« back to all changes in this revision

Viewing changes to exo/exo-toolbars-editor.c

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc
  • Date: 2009-08-21 14:28:56 UTC
  • mfrom: (1.1.22 upstream)
  • Revision ID: james.westby@ubuntu.com-20090821142856-xp7o7hl7x9xa2213
Tags: 0.3.102-1ubuntu1
* Merge from Debian unstable, remaining Ubuntu changes:
  - debian/rules:
    + Removed mangling of helpers.rc
    + Add --enable-gtk-doc switch to configure
  - debian/control:
    + Add build-dep on gtk-doc-tools
    + Update Vcs-* fields
  - debian/patches:
    + 04_update_helpers.patch: patched libexo's firefox helper desktop file
      to use firefox-3.0 icon instead of firefox icon
    + xubuntu-default-mount-options.patch: change default mount options for
      vfat, iso9660, ntfs
    + series: refreshed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
exo/exo-toolbars-editor.c
1
 
/* $Id: exo-toolbars-editor.c 22088 2006-06-13 14:21:58Z benny $ */
 
1
/* $Id$ */
2
2
/*-
3
3
 * Copyright (c) 2004-2006 os-cillation e.K.
4
4
 * Copyright (c) 2003      Marco Pesenti Gritti
340
340
    {
341
341
      gtk_image_get_stock (image, &stock_id, NULL);
342
342
      pixbuf = gtk_widget_render_icon (widget, stock_id, GTK_ICON_SIZE_LARGE_TOOLBAR, NULL);
343
 
      gtk_drag_source_set_icon_pixbuf (widget, pixbuf);
 
343
      if (G_LIKELY (pixbuf != NULL))
 
344
        gtk_drag_source_set_icon_pixbuf (widget, pixbuf);
344
345
    }
345
346
  else if (type == GTK_IMAGE_PIXBUF)
346
347
    {
347
348
      pixbuf = gtk_image_get_pixbuf (image);
348
 
      gtk_drag_source_set_icon_pixbuf (widget, pixbuf);
 
349
      if (G_LIKELY (pixbuf != NULL))
 
350
        gtk_drag_source_set_icon_pixbuf (widget, pixbuf);
349
351
    }
350
352
}
351
353