← Back to branch summary

~ubuntu-branches/debian/squeeze/gnome-main-menu/squeeze

« back to all changes in this revision

Viewing changes to libslab/application-tile.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Biebl
  • Date: 2009-05-07 17:08:50 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20090507170850-2cpq07j27tedp3fp
Tags: 0.9.12-2~squeeze1
* Rebuild for squeeze against NM 0.7.
* Upload coordinated with the release team.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libslab/application-tile.c
150
150
 
151
151
        desktop_item = load_desktop_item_from_unknown (desktop_item_id);
152
152
 
153
 
        if (desktop_item)
 
153
        if (
 
154
                desktop_item &&
 
155
                gnome_desktop_item_get_entry_type (desktop_item) == GNOME_DESKTOP_ITEM_TYPE_APPLICATION
 
156
        )
154
157
                uri = gnome_desktop_item_get_location (desktop_item);
155
158
 
156
 
        if (! desktop_item || ! uri)
 
159
        if (! uri) {
 
160
                if (desktop_item)
 
161
                        gnome_desktop_item_unref (desktop_item);
 
162
 
157
163
                return NULL;
 
164
        }
158
165
 
159
166
        this = g_object_new (APPLICATION_TILE_TYPE, "tile-uri", uri, NULL);
160
167
        priv = APPLICATION_TILE_GET_PRIVATE (this);
323
330
          atk_object_set_description (accessible, desc);
324
331
 
325
332
        header    = create_header    (name);
326
 
        if (desc && priv->show_generic_name)  /*if no GenericName then just show and center the Name */
 
333
 
 
334
        /*if no GenericName then just show and center the Name */
 
335
        if (desc && priv->show_generic_name
 
336
            && (!name || strcmp(name, desc) != 0))
327
337
                subheader = create_subheader (desc);
328
338
        else
329
339
                subheader = NULL;