~ubuntu-branches/ubuntu/oneiric/gnome-panel/oneiric

« back to all changes in this revision

Viewing changes to gnome-panel/menu.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-01-14 22:20:05 UTC
  • mto: (2.1.6 squeeze) (1.3.3 upstream)
  • mto: This revision was merged to the branch mainline in revision 171.
  • Revision ID: james.westby@ubuntu.com-20100114222005-rll7tw9fojl3ac6z
Tags: upstream-2.29.5.1
ImportĀ upstreamĀ versionĀ 2.29.5.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
32
32
#include <gconf/gconf-client.h>
33
33
 
34
34
#include <libpanel-util/panel-keyfile.h>
 
35
#include <libpanel-util/panel-xdg.h>
35
36
 
36
37
#include "launcher.h"
37
38
#include "panel-util.h"
1525
1526
 
1526
1527
                        icon = gmenu_tree_entry_get_icon (entry);
1527
1528
                        if (!g_path_is_absolute (icon)) {
1528
 
                                icon_no_ext = panel_util_icon_remove_extension (icon);
 
1529
                                icon_no_ext = panel_xdg_icon_remove_extension (icon);
1529
1530
                                gtk_drag_source_set_icon_name (menuitem,
1530
1531
                                                               icon_no_ext);
1531
1532
                                g_free (icon_no_ext);