Hello community,
here is the log from the commit of package gnome-main-menu
checked in at Wed Oct 3 00:55:01 CEST 2007.
--------
--- GNOME/gnome-main-menu/gnome-main-menu.changes 2007-09-25 16:29:37.000000000 +0200
+++ /mounts/work_src_done/STABLE/gnome-main-menu/gnome-main-menu.changes 2007-10-02 21:31:14.753690000 +0200
@@ -1,0 +2,5 @@
+Tue Oct 2 21:30:39 CEST 2007 - jimmyk@suse.de
+
+- Add patch to reintegrate misplaced .desktop files after upgrade, BNC #327130.
+
+-------------------------------------------------------------------
New:
----
gnome-main-menu-misplaced-system-desktop-files.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-main-menu.spec ++++++
--- /var/tmp/diff_new_pack.p32231/_old 2007-10-03 00:54:53.000000000 +0200
+++ /var/tmp/diff_new_pack.p32231/_new 2007-10-03 00:54:53.000000000 +0200
@@ -19,10 +19,11 @@
Group: System/GUI/GNOME
AutoReqProv: on
Version: 0.9.8
-Release: 93
+Release: 97
Summary: The GNOME Desktop Menu
Source: %{name}-%{version}.tar.gz
Source1: system-items-opensuse.xbel
+Patch: gnome-main-menu-misplaced-system-desktop-files.patch
Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: gnome-panel dbus-1-glib hal tango-icon-theme wireless-tools libssui
@@ -75,6 +76,7 @@
%lang_package
%prep
%setup -n gnome-main-menu-%{version}
+%patch -p1
cp -f %{S:1} main-menu/etc/system-items.xbel
%build
@@ -144,6 +146,8 @@
%{_prefix}/%{_lib}/nautilus/extensions-1.0/*.so
%{_prefix}/%{_lib}/nautilus/extensions-1.0/*.la
%changelog
+* Tue Oct 02 2007 - jimmyk@suse.de
+- Add patch to reintegrate misplaced .desktop files after upgrade, BNC #327130.
* Tue Sep 25 2007 - cthiel@suse.de
- don't package -lang files in main package
* Wed Sep 19 2007 - jimmyk@suse.de
++++++ gnome-main-menu-misplaced-system-desktop-files.patch ++++++
# Patch to correct misplaced .desktop files when upgrading.
# BNC #327130
# SwampID 13500
# Jim Krehl Tue Oct 2 15:00:42 EDT 2007
diff -upr gnome-main-menu-0.9.8-pristine/libslab/libslab-utils.c gnome-main-menu-0.9.8/libslab/libslab-utils.c
--- gnome-main-menu-0.9.8-pristine/libslab/libslab-utils.c 2007-09-14 16:55:28.000000000 -0400
+++ gnome-main-menu-0.9.8/libslab/libslab-utils.c 2007-10-02 13:27:46.000000000 -0400
@@ -84,6 +84,7 @@ GnomeDesktopItem *
libslab_gnome_desktop_item_new_from_unknown_id (const gchar *id)
{
GnomeDesktopItem *item;
+ gchar *basename;
GError *error = NULL;
@@ -118,6 +119,21 @@ libslab_gnome_desktop_item_new_from_unkn
error = NULL;
}
+ basename = g_strrstr (id, "/");
+
+ if (basename) {
+ basename++;
+
+ item = gnome_desktop_item_new_from_basename (basename, 0, &error);
+
+ if (! error)
+ return item;
+ else {
+ g_error_free (error);
+ error = NULL;
+ }
+ }
+
return NULL;
}
diff -upr gnome-main-menu-0.9.8-pristine/libslab/slab-gnome-util.c gnome-main-menu-0.9.8/libslab/slab-gnome-util.c
--- gnome-main-menu-0.9.8-pristine/libslab/slab-gnome-util.c 2007-09-14 16:55:28.000000000 -0400
+++ gnome-main-menu-0.9.8/libslab/slab-gnome-util.c 2007-10-02 14:47:53.000000000 -0400
@@ -148,43 +148,56 @@ load_desktop_item_from_gconf_key (const
}
GnomeDesktopItem *
-load_desktop_item_from_unknown (const gchar * id)
+load_desktop_item_from_unknown (const gchar *id)
{
GnomeDesktopItem *item;
- GError *error;
+ gchar *basename;
+
+ GError *error = NULL;
- error = NULL;
item = gnome_desktop_item_new_from_uri (id, 0, &error);
- if (!error)
+ if (! error)
return item;
- else
- {
+ else {
g_error_free (error);
error = NULL;
}
item = gnome_desktop_item_new_from_file (id, 0, &error);
- if (!error)
+ if (! error)
return item;
- else
- {
+ else {
g_error_free (error);
error = NULL;
}
item = gnome_desktop_item_new_from_basename (id, 0, &error);
- if (!error)
+ if (! error)
return item;
- else
- {
+ else {
g_error_free (error);
error = NULL;
}
+ basename = g_strrstr (id, "/");
+
+ if (basename) {
+ basename++;
+
+ item = gnome_desktop_item_new_from_basename (basename, 0, &error);
+
+ if (! error)
+ return item;
+ else {
+ g_error_free (error);
+ error = NULL;
+ }
+ }
+
return NULL;
}
diff -upr gnome-main-menu-0.9.8-pristine/main-menu/src/main-menu-ui.c gnome-main-menu-0.9.8/main-menu/src/main-menu-ui.c
--- gnome-main-menu-0.9.8-pristine/main-menu/src/main-menu-ui.c 2007-09-14 16:55:28.000000000 -0400
+++ gnome-main-menu-0.9.8/main-menu/src/main-menu-ui.c 2007-09-27 15:46:53.000000000 -0400
@@ -1008,10 +1008,30 @@ item_to_dir_tile (BookmarkItem *item, gp
static Tile *
item_to_system_tile (BookmarkItem *item, gpointer data)
{
+ Tile *tile;
+ gchar *basename;
+
+
if (app_is_in_blacklist (item->uri))
return NULL;
- return TILE (system_tile_new (item->uri, item->title));
+ tile = TILE (system_tile_new (item->uri, item->title));
+
+ if (tile)
+ return tile;
+
+ basename = g_strrstr (item->uri, "/");
+ if (basename)
+ basename++;
+ else
+ basename = item->uri;
+
+ if (! libslab_strcmp (basename, "control-center.desktop"))
+ tile = TILE (system_tile_new ("gnomecc.desktop", item->title));
+ else if (! libslab_strcmp (basename, "zen-installer.desktop"))
+ tile = TILE (system_tile_new ("package-manager.desktop", item->title));
+
+ return tile;
}
static BookmarkItem *
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org