diff options
author | Vincent Untz <vuntz@gnome.org> | 2006-04-10 12:59:44 +0000 |
---|---|---|
committer | Vincent Untz <vuntz@src.gnome.org> | 2006-04-10 12:59:44 +0000 |
commit | 7c07824487d03cc0ee10b44adc1bbb160d40a324 (patch) | |
tree | ba898f80f4f661b7d7574115042c5594b171c30a | |
parent | 6d936311c93f4e7e39577afe6e72d1db3e9dceec (diff) | |
download | gnome-desktop-7c07824487d03cc0ee10b44adc1bbb160d40a324.tar.gz |
Backport from HEAD.
2006-04-10 Vincent Untz <vuntz@gnome.org>
Backport from HEAD.
* gnome-desktop-item.c: (ditem_execute): use
gdk_x11_display_get_user_time() to get the launch time
Fix bug #165689
-rw-r--r-- | libgnome-desktop/ChangeLog | 8 | ||||
-rw-r--r-- | libgnome-desktop/gnome-desktop-item.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/libgnome-desktop/ChangeLog b/libgnome-desktop/ChangeLog index 205132c4..b9efd6d1 100644 --- a/libgnome-desktop/ChangeLog +++ b/libgnome-desktop/ChangeLog @@ -2,6 +2,14 @@ Backport from HEAD. + * gnome-desktop-item.c: (ditem_execute): use + gdk_x11_display_get_user_time() to get the launch time + Fix bug #165689 + +2006-04-10 Vincent Untz <vuntz@gnome.org> + + Backport from HEAD. + * gnome-ditem-edit.c: (ensure_item_localefiled): new (gnome_ditem_edit_sync_ditem): add a C name/comment/genericname if there's none, copied from the locale value diff --git a/libgnome-desktop/gnome-desktop-item.c b/libgnome-desktop/gnome-desktop-item.c index d2199f09..e980219c 100644 --- a/libgnome-desktop/gnome-desktop-item.c +++ b/libgnome-desktop/gnome-desktop-item.c @@ -1929,7 +1929,7 @@ ditem_execute (const GnomeDesktopItem *item, if (item->launch_time > 0) launch_time = item->launch_time; else - launch_time = gtk_get_current_event_time (); + launch_time = gdk_x11_display_get_user_time (gdk_screen_get_display (screen)); sn_launcher_context_initiate (sn_context, g_get_prgname () ? g_get_prgname () : "unknown", |