rpms/gnome-panel/devel gnome-panel-search.patch, NONE, 1.1 gnome-panel-vendor.patch, NONE, 1.1 .cvsignore, 1.96, 1.97 gnome-panel-about.patch, 1.1, 1.2 gnome-panel.spec, 1.366, 1.367 sources, 1.99, 1.100
Matthias Clasen
mclasen at fedoraproject.org
Tue Aug 25 18:14:43 UTC 2009
- Previous message: rpms/nss-softokn/devel nss-softokn.pc.in,NONE,1.1.2.2
- Next message: rpms/lyx/F-10 lyx-1.6.4-xdg_open.patch, NONE, 1.1 .cvsignore, 1.39, 1.40 lyx.spec, 1.87, 1.88 sources, 1.37, 1.38 lyx-1.6.3-xdg_open.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mclasen
Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31221
Modified Files:
.cvsignore gnome-panel-about.patch gnome-panel.spec sources
Added Files:
gnome-panel-search.patch gnome-panel-vendor.patch
Log Message:
2.27.91
gnome-panel-search.patch:
libpanel-util/panel-launch.c | 19 +++++++++++++++++++
libpanel-util/panel-launch.h | 2 ++
panel-action-button.c | 16 +++++++++++++---
panel-menu-items.c | 20 ++++++++++++++++----
4 files changed, 50 insertions(+), 7 deletions(-)
--- NEW FILE gnome-panel-search.patch ---
diff -up gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.c.search gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.c
--- gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.c.search 2009-04-19 13:45:09.000000000 -0400
+++ gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.c 2009-08-25 11:33:36.666288948 -0400
@@ -29,6 +29,8 @@
#include <gdk/gdk.h>
#include <gtk/gtk.h>
+#include <libgnome/gnome-desktop-item.h>
+
#include "panel-error.h"
#include "panel-glib.h"
@@ -201,6 +203,23 @@ panel_launch_desktop_file (const char *
}
gboolean
+panel_has_desktop_file (const char *desktop_file)
+{
+ GnomeDesktopItem *ditem;
+
+ if (g_path_is_absolute (desktop_file))
+ ditem = gnome_desktop_item_new_from_file (desktop_file, 0, NULL);
+ else
+ ditem = gnome_desktop_item_new_from_basename (desktop_file, 0, NULL);
+ if (ditem != NULL) {
+ gnome_desktop_item_unref (ditem);
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+gboolean
panel_launch_desktop_file_with_fallback (const char *desktop_file,
const char *fallback_exec,
GdkScreen *screen,
diff -up gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.h.search gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.h
--- gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.h.search 2009-04-19 13:45:09.000000000 -0400
+++ gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.h 2009-08-25 11:33:36.667276923 -0400
@@ -47,6 +47,8 @@ gboolean panel_launch_key_file (GKeyFile
GdkScreen *screen,
GError **error);
+gboolean panel_has_desktop_file (const char *desktop_file);
+
gboolean panel_launch_desktop_file (const char *desktop_file,
GdkScreen *screen,
GError **error);
diff -up gnome-panel-2.27.91/gnome-panel/panel-action-button.c.search gnome-panel-2.27.91/gnome-panel/panel-action-button.c
--- gnome-panel-2.27.91/gnome-panel/panel-action-button.c.search 2009-04-19 13:45:09.000000000 -0400
+++ gnome-panel-2.27.91/gnome-panel/panel-action-button.c 2009-08-25 11:33:36.671290074 -0400
@@ -219,9 +219,19 @@ panel_action_search (GtkWidget *widget)
GdkScreen *screen;
screen = gtk_widget_get_screen (widget);
- panel_launch_desktop_file_with_fallback ("gnome-search-tool.desktop",
- "gnome-search-tool",
- screen, NULL);
+ if (panel_has_desktop_file ("gnome-beagle-search.desktop")) {
+ panel_launch_desktop_file ("gnome-beagle-search.desktop",
+ screen,
+ NULL);
+ } else if (panel_has_desktop_file ("fedora-tracker-search-tool.desktop")) {
+ panel_launch_desktop_file ("fedora-tracker-search-tool.desktop",
+ screen,
+ NULL);
+ } else {
+ panel_launch_desktop_file ("gnome-search-tool.desktop",
+ screen,
+ NULL);
+ }
}
/* Force Quit
diff -up gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.search gnome-panel-2.27.91/gnome-panel/panel-menu-items.c
--- gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.search 2009-08-25 11:33:36.643267021 -0400
+++ gnome-panel-2.27.91/gnome-panel/panel-menu-items.c 2009-08-25 11:42:41.517027329 -0400
@@ -1062,10 +1062,22 @@ panel_place_menu_item_create_menu (Panel
add_menu_separator (places_menu);
- panel_menu_items_append_from_desktop (places_menu,
- "gnome-search-tool.desktop",
- NULL,
- FALSE);
+ if (panel_has_desktop_file ("gnome-beagle-search.desktop")) {
+ panel_menu_items_append_from_desktop (places_menu,
+ "gnome-beagle-search.desktop",
+ NULL,
+ FALSE);
+ } else if (panel_has_desktop_file ("fedora-tracker-search-tool.desktop")) {
+ panel_menu_items_append_from_desktop (places_menu,
+ "fedora-tracker-search-tool.desktop",
+ NULL,
+ FALSE);
+ } else {
+ panel_menu_items_append_from_desktop (places_menu,
+ "gnome-search-tool.desktop",
+ NULL,
+ FALSE);
+ }
panel_recent_append_documents_menu (places_menu,
place_item->priv->recent_manager);
gnome-panel-vendor.patch:
panel-menu-items.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE gnome-panel-vendor.patch ---
diff -up gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.vendor gnome-panel-2.27.91/gnome-panel/panel-menu-items.c
--- gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.vendor 2009-08-19 15:59:57.000000000 -0400
+++ gnome-panel-2.27.91/gnome-panel/panel-menu-items.c 2009-08-25 11:32:39.980266025 -0400
@@ -1038,7 +1038,7 @@ panel_place_menu_item_create_menu (Panel
COMPUTER_NAME_KEY,
NULL);
panel_menu_items_append_from_desktop (places_menu,
- "nautilus-computer.desktop",
+ "gnome-nautilus-computer.desktop",
gconf_name,
TRUE);
if (gconf_name)
@@ -1048,7 +1048,7 @@ panel_place_menu_item_create_menu (Panel
add_menu_separator (places_menu);
panel_menu_items_append_from_desktop (places_menu,
- "network-scheme.desktop",
+ "gnome-network-scheme.desktop",
NULL,
TRUE);
panel_place_menu_item_append_remote_gio (place_item, places_menu);
@@ -1157,7 +1157,7 @@ panel_desktop_menu_item_append_menu (Gtk
if (add_separator)
add_menu_separator (menu);
- panel_menu_items_append_from_desktop (menu, "yelp.desktop", NULL, FALSE);
+ panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL, FALSE);
panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL, FALSE);
if (parent->priv->append_lock_logout)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/.cvsignore,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- .cvsignore 15 Jul 2009 18:57:08 -0000 1.96
+++ .cvsignore 25 Aug 2009 18:14:42 -0000 1.97
@@ -1 +1 @@
-gnome-panel-2.27.4.tar.bz2
+gnome-panel-2.27.91.tar.bz2
gnome-panel-about.patch:
panel-menu-items.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Index: gnome-panel-about.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel-about.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gnome-panel-about.patch 1 Aug 2009 00:09:52 -0000 1.1
+++ gnome-panel-about.patch 25 Aug 2009 18:14:42 -0000 1.2
@@ -1,11 +1,11 @@
-diff -up gnome-panel-2.27.4/gnome-panel/panel-menu-items.c.about gnome-panel-2.27.4/gnome-panel/panel-menu-items.c
---- gnome-panel-2.27.4/gnome-panel/panel-menu-items.c.about 2009-07-31 18:29:02.635601324 -0400
-+++ gnome-panel-2.27.4/gnome-panel/panel-menu-items.c 2009-07-31 18:30:18.129605780 -0400
-@@ -1159,7 +1159,8 @@ panel_desktop_menu_item_append_menu (Gtk
+diff -up gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.about gnome-panel-2.27.91/gnome-panel/panel-menu-items.c
+--- gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.about 2009-08-25 13:32:12.101272238 -0400
++++ gnome-panel-2.27.91/gnome-panel/panel-menu-items.c 2009-08-25 14:08:21.444015913 -0400
+@@ -1170,7 +1170,8 @@ panel_desktop_menu_item_append_menu (Gtk
add_menu_separator (menu);
- panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL);
-- panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL);
+ panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL, FALSE);
+- panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL, FALSE);
+ if (panel_has_desktop_file ("about-this-computer.desktop"))
+ panel_menu_items_append_from_desktop (menu, "about-this-computer.desktop", NULL);
Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -p -r1.366 -r1.367
--- gnome-panel.spec 22 Aug 2009 05:08:13 -0000 1.366
+++ gnome-panel.spec 25 Aug 2009 18:14:42 -0000 1.367
@@ -22,8 +22,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.27.4
-Release: 9%{?dist}
+Version: 2.27.91
+Release: 1%{?dist}
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-panel/2.27/%{name}-%{version}.tar.bz2
@@ -89,9 +89,9 @@ BuildRequires: intltool
BuildRequires: gettext-devel
BuildRequires: libtool
-Patch0: gnome-panel-2.23.4-vendor.patch
+Patch0: gnome-panel-vendor.patch
Patch1: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
-Patch2: gnome-panel-2.25.3-search.patch
+Patch2: gnome-panel-search.patch
Patch3: gnome-panel-about.patch
# the next three patches belong together
@@ -113,17 +113,6 @@ Patch35: clock-wakeups.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=579092
Patch38: clock-network.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=498366
-Patch42: polkit1.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=322932
-Patch45: panel-icons.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=589632
-Patch46:gnome-panel-2.27.4-fix-monitor.patch
-
-Patch47: recent-icon.patch
-
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -160,7 +149,7 @@ Panel Applets using the libpanel-applet
%patch0 -p1 -b .vendor
%patch1 -p1 -b .speak-to-us-ye-old-wise-fish
-%patch2 -p0 -b .search
+%patch2 -p1 -b .search
%patch3 -p1 -b .about
%patch8 -p1 -b .launcher-desktop-files
%patch9 -p1 -b .desktop-file-monitoring
@@ -169,10 +158,6 @@ Panel Applets using the libpanel-applet
%patch24 -p1 -b .allow-spurious-view-done-signals
%patch35 -p1 -b .clock-wakeups
%patch38 -p1 -b .clock-network
-%patch42 -p1 -b .polkit1
-%patch45 -p1 -b .panel-icons
-%patch46 -p1 -b .fix-monitor
-%patch47 -p1 -b .recent-icon
. %{SOURCE6}
@@ -371,6 +356,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Aug 25 2009 Matthias Clasen <mclasen at redhat.com> 2.27.91-1
+- Update to 2.27.91
+
* Sat Aug 22 2009 Matthias Clasen <mclasen at redhat.com> 2.27.4-9
- Actually apply the 'clear recent' patch
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/sources,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- sources 15 Jul 2009 18:57:08 -0000 1.99
+++ sources 25 Aug 2009 18:14:42 -0000 1.100
@@ -1 +1 @@
-8878c295b927f9a42273ff414a8bfdd8 gnome-panel-2.27.4.tar.bz2
+9453fed0d5fec7b9904b408e3f2826f7 gnome-panel-2.27.91.tar.bz2
- Previous message: rpms/nss-softokn/devel nss-softokn.pc.in,NONE,1.1.2.2
- Next message: rpms/lyx/F-10 lyx-1.6.4-xdg_open.patch, NONE, 1.1 .cvsignore, 1.39, 1.40 lyx.spec, 1.87, 1.88 sources, 1.37, 1.38 lyx-1.6.3-xdg_open.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list