rpms/gnome-panel/devel gnome-panel-2.23.4-vendor.patch, NONE, 1.1 gnome-panel-launch-with-gio.patch, 1.1, 1.2 gnome-panel.spec, 1.308, 1.309 icon-names.patch, 1.1, 1.2 preferred-apps.patch, 1.5, 1.6
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Sat Jul 19 01:58:59 UTC 2008
- Previous message (by thread): rpms/NetworkManager-openvpn/devel .cvsignore, 1.6, 1.7 NetworkManager-openvpn.spec, 1.17, 1.18 sources, 1.9, 1.10
- Next message (by thread): rpms/thunar-archive-plugin/devel thunar-archive-plugin-0.2.4-fileroller-extract-here.patch, NONE, 1.1 thunar-archive-plugin.spec, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mclasen
Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7373
Modified Files:
gnome-panel-launch-with-gio.patch gnome-panel.spec
icon-names.patch preferred-apps.patch
Added Files:
gnome-panel-2.23.4-vendor.patch
Log Message:
fix one more icon
gnome-panel-2.23.4-vendor.patch:
--- NEW FILE gnome-panel-2.23.4-vendor.patch ---
diff -up gnome-panel-2.23.4/gnome-panel/panel-menu-items.c.vendor gnome-panel-2.23.4/gnome-panel/panel-menu-items.c
--- gnome-panel-2.23.4/gnome-panel/panel-menu-items.c.vendor 2008-06-17 06:02:08.000000000 -0400
+++ gnome-panel-2.23.4/gnome-panel/panel-menu-items.c 2008-07-18 21:40:34.000000000 -0400
@@ -1011,7 +1011,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);
if (gconf_name)
g_free (gconf_name);
@@ -1024,7 +1024,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);
panel_place_menu_item_append_remote_gio (place_item, places_menu);
@@ -1131,7 +1131,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);
+ panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL);
panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL);
if (parent->priv->append_lock_logout)
gnome-panel-launch-with-gio.patch:
Index: gnome-panel-launch-with-gio.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel-launch-with-gio.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-panel-launch-with-gio.patch 22 Apr 2008 16:11:33 -0000 1.1
+++ gnome-panel-launch-with-gio.patch 19 Jul 2008 01:57:55 -0000 1.2
@@ -1,15 +1,15 @@
-diff -up gnome-panel-2.22.1.2/gnome-panel/panel-menu-items.c.launch-with-gio gnome-panel-2.22.1.2/gnome-panel/panel-menu-items.c
---- gnome-panel-2.22.1.2/gnome-panel/panel-menu-items.c.launch-with-gio 2008-04-20 23:54:37.000000000 -0400
-+++ gnome-panel-2.22.1.2/gnome-panel/panel-menu-items.c 2008-04-20 23:54:37.000000000 -0400
+diff -up gnome-panel-2.23.4/gnome-panel/panel-menu-items.c.launch-with-gio gnome-panel-2.23.4/gnome-panel/panel-menu-items.c
+--- gnome-panel-2.23.4/gnome-panel/panel-menu-items.c.launch-with-gio 2008-07-18 21:45:57.000000000 -0400
++++ gnome-panel-2.23.4/gnome-panel/panel-menu-items.c 2008-07-18 21:52:41.000000000 -0400
@@ -41,6 +41,7 @@
#include <libgnome/gnome-url.h>
#include <libgnomeui/gnome-url.h>
+#include <libgnomeui/gnome-password-dialog.h>
- #include "menu.h"
- #include "panel-action-button.h"
-@@ -96,6 +97,51 @@ struct _PanelDesktopMenuItemPrivate {
+ #include <libpanel-util/panel-keyfile.h>
+
+@@ -98,6 +99,51 @@ struct _PanelDesktopMenuItemPrivate {
guint append_lock_logout : 1;
};
@@ -46,7 +46,7 @@
+ g_free (escaped);
+ panel_error_dialog (NULL, handle->screen,
+ "cannot_show_url", TRUE,
-+ primary, error->message);
++ primary, error->message);
+ g_free (primary);
+ }
+ g_error_free (error);
@@ -59,9 +59,9 @@
+}
+
static void
- activate_uri (GtkWidget *menuitem,
- const char *path)
-@@ -125,12 +171,28 @@ activate_uri (GtkWidget *menuitem,
+ activate_uri_on_screen (const char *path,
+ GdkScreen *screen)
+@@ -124,12 +170,28 @@ activate_uri_on_screen (const char *path
command = g_strdup_printf ("nautilus --no-desktop %s", url);
gdk_spawn_command_line_on_screen (screen, command, &error);
@@ -93,9 +93,9 @@
char *primary;
escaped = g_markup_escape_text (url, -1);
primary = g_strdup_printf (_("Could not open location '%s'"),
-diff -up gnome-panel-2.22.1.2/gnome-panel/panel-mount-operation.c.launch-with-gio gnome-panel-2.22.1.2/gnome-panel/panel-mount-operation.c
---- gnome-panel-2.22.1.2/gnome-panel/panel-mount-operation.c.launch-with-gio 2008-04-21 00:10:20.000000000 -0400
-+++ gnome-panel-2.22.1.2/gnome-panel/panel-mount-operation.c 2008-04-21 00:13:35.000000000 -0400
+diff -up gnome-panel-2.23.4/gnome-panel/panel-mount-operation.c.launch-with-gio gnome-panel-2.23.4/gnome-panel/panel-mount-operation.c
+--- gnome-panel-2.23.4/gnome-panel/panel-mount-operation.c.launch-with-gio 2008-06-17 06:02:08.000000000 -0400
++++ gnome-panel-2.23.4/gnome-panel/panel-mount-operation.c 2008-07-18 21:45:57.000000000 -0400
@@ -102,6 +102,18 @@ password_dialog_button_clicked (GtkDialo
anon = gnome_password_dialog_anon_selected (gpd);
g_mount_operation_set_anonymous (op, anon);
Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -r1.308 -r1.309
--- gnome-panel.spec 10 Jul 2008 03:23:01 -0000 1.308
+++ gnome-panel.spec 19 Jul 2008 01:57:55 -0000 1.309
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.23.4
-Release: 4%{?dist}
+Release: 5%{?dist}
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar.bz2
@@ -87,7 +87,7 @@
BuildRequires: librsvg2-devel
BuildRequires: NetworkManager-devel
-Patch0: gnome-panel-2.19.5-vendor.patch
+Patch0: gnome-panel-2.23.4-vendor.patch
Patch1: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
Patch2: gnome-panel-2.17.91-about-fedora.patch
Patch4: gnome-panel-2.16.1-search.patch
@@ -160,7 +160,7 @@
%patch1 -p1 -b .speak-to-us-ye-old-wise-fish
%patch2 -p1 -b .about-fedora
%patch4 -p1 -b .search
-#%patch6 -p0 -b .compiz-support
+##%patch6 -p0 -b .compiz-support
%patch7 -p1 -b .about-this-computer
%patch8 -p1 -b .launcher-desktop-files
%patch9 -p1 -b .desktop-file-monitoring
@@ -358,6 +358,9 @@
%{_datadir}/gtk-doc/html/*
%changelog
+* Fri Jul 18 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.4-5
+- Fix one more icon
+
* Wed Jul 9 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.4-4
- Move panel-test-applets to the -devel package
icon-names.patch:
Index: icon-names.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/icon-names.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icon-names.patch 9 Jul 2008 20:59:14 -0000 1.1
+++ icon-names.patch 19 Jul 2008 01:57:55 -0000 1.2
@@ -1,6 +1,18 @@
+diff -up gnome-panel-2.23.4/applets/wncklet/GNOME_Wncklet_Factory.server.in.in.icon-names gnome-panel-2.23.4/applets/wncklet/GNOME_Wncklet_Factory.server.in.in
+--- gnome-panel-2.23.4/applets/wncklet/GNOME_Wncklet_Factory.server.in.in.icon-names 2008-07-18 21:54:05.000000000 -0400
++++ gnome-panel-2.23.4/applets/wncklet/GNOME_Wncklet_Factory.server.in.in 2008-07-18 21:54:20.000000000 -0400
+@@ -122,7 +122,7 @@
+ </oaf_attribute>
+ <oaf_attribute name="name" type="string" _value="Show Desktop"/>
+ <oaf_attribute name="description" type="string" _value="Hide application windows and show the desktop"/>
+- <oaf_attribute name="panel:icon" type="string" value="gnome-fs-desktop.png"/>
++ <oaf_attribute name="panel:icon" type="string" value="user-desktop.png"/>
+ <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
+ <oaf_attribute name="bugzilla:product" type="string" value="gnome-panel"/>
+ <oaf_attribute name="bugzilla:component" type="string" value="Show Desktop Button"/>
diff -up gnome-panel-2.23.4/gnome-panel/panel-icon-names.h.icon-names gnome-panel-2.23.4/gnome-panel/panel-icon-names.h
---- gnome-panel-2.23.4/gnome-panel/panel-icon-names.h.icon-names 2008-07-09 15:22:29.000000000 -0400
-+++ gnome-panel-2.23.4/gnome-panel/panel-icon-names.h 2008-07-09 15:22:43.000000000 -0400
+--- gnome-panel-2.23.4/gnome-panel/panel-icon-names.h.icon-names 2008-06-17 06:02:08.000000000 -0400
++++ gnome-panel-2.23.4/gnome-panel/panel-icon-names.h 2008-07-18 21:53:39.000000000 -0400
@@ -25,7 +25,7 @@
#define PANEL_ICON_SEPARATOR "gnome-panel-separator"
#define PANEL_ICON_SAVED_SEARCH "folder-saved-search"
preferred-apps.patch:
Index: preferred-apps.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/preferred-apps.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- preferred-apps.patch 18 Jun 2008 21:31:13 -0000 1.5
+++ preferred-apps.patch 19 Jul 2008 01:57:55 -0000 1.6
@@ -1,34 +1,15 @@
-diff -up gnome-panel-2.21.91/gnome-panel/main.c.preferred-apps gnome-panel-2.21.91/gnome-panel/main.c
---- gnome-panel-2.21.91/gnome-panel/main.c.preferred-apps 2008-02-11 16:15:47.000000000 -0500
-+++ gnome-panel-2.21.91/gnome-panel/main.c 2008-02-13 20:44:49.000000000 -0500
-@@ -26,6 +26,7 @@
- #include "panel-action-protocol.h"
- #include "panel-lockdown.h"
- #include "panel-icon-names.h"
-+#include "launcher.h"
- #include "xstuff.h"
-
- #include "nothing.cP"
-@@ -81,6 +82,7 @@ main (int argc, char **argv)
- GCONF_CLIENT_PRELOAD_NONE,
- NULL);
-
-+ panel_preferred_apps_init ();
- panel_global_config_load ();
- panel_lockdown_init ();
- panel_profile_load ();
-diff -up gnome-panel-2.21.91/gnome-panel/launcher.c.preferred-apps gnome-panel-2.21.91/gnome-panel/launcher.c
---- gnome-panel-2.21.91/gnome-panel/launcher.c.preferred-apps 2008-02-13 20:44:49.000000000 -0500
-+++ gnome-panel-2.21.91/gnome-panel/launcher.c 2008-02-13 20:44:49.000000000 -0500
+diff -up gnome-panel-2.23.4/gnome-panel/launcher.c.preferred-apps gnome-panel-2.23.4/gnome-panel/launcher.c
+--- gnome-panel-2.23.4/gnome-panel/launcher.c.preferred-apps 2008-07-18 21:44:07.000000000 -0400
++++ gnome-panel-2.23.4/gnome-panel/launcher.c 2008-07-18 21:44:51.000000000 -0400
@@ -23,6 +23,7 @@
#include <libgnome/gnome-util.h>
#include <libgnomeui/gnome-url.h>
#include <gdk/gdkx.h>
+#include <gmenu-tree.h>
- #include "launcher.h"
+ #include <libpanel-util/panel-keyfile.h>
-@@ -40,6 +41,7 @@
+@@ -42,6 +43,7 @@
#include "panel-compatibility.h"
#include "panel-ditem-editor.h"
#include "panel-icon-names.h"
@@ -36,7 +17,7 @@
static GdkScreen *
launcher_get_screen (Launcher *launcher)
-@@ -1299,3 +1301,173 @@ panel_launcher_set_dnd_enabled (Launcher
+@@ -1297,3 +1299,173 @@ panel_launcher_set_dnd_enabled (Launcher
} else
gtk_drag_source_unset (launcher->button);
}
@@ -210,9 +191,9 @@
+ filename, g_free, NULL);
+ }
+}
-diff -up gnome-panel-2.21.91/gnome-panel/launcher.h.preferred-apps gnome-panel-2.21.91/gnome-panel/launcher.h
---- gnome-panel-2.21.91/gnome-panel/launcher.h.preferred-apps 2008-02-13 20:44:49.000000000 -0500
-+++ gnome-panel-2.21.91/gnome-panel/launcher.h 2008-02-13 20:45:58.000000000 -0500
+diff -up gnome-panel-2.23.4/gnome-panel/launcher.h.preferred-apps gnome-panel-2.23.4/gnome-panel/launcher.h
+--- gnome-panel-2.23.4/gnome-panel/launcher.h.preferred-apps 2008-07-18 21:44:07.000000000 -0400
++++ gnome-panel-2.23.4/gnome-panel/launcher.h 2008-07-18 21:44:07.000000000 -0400
@@ -14,6 +14,8 @@
#include "applet.h"
#include "panel-widget.h"
@@ -230,22 +211,29 @@
G_END_DECLS
-diff -up gnome-panel-2.21.91/gnome-panel/panel-run-dialog.h.preferred-apps gnome-panel-2.21.91/gnome-panel/panel-run-dialog.h
---- gnome-panel-2.21.91/gnome-panel/panel-run-dialog.h.preferred-apps 2008-02-11 16:15:47.000000000 -0500
-+++ gnome-panel-2.21.91/gnome-panel/panel-run-dialog.h 2008-02-13 20:44:49.000000000 -0500
-@@ -32,6 +32,8 @@ G_BEGIN_DECLS
- void panel_run_dialog_present (GdkScreen *screen,
- guint32 activate_time);
+diff -up gnome-panel-2.23.4/gnome-panel/main.c.preferred-apps gnome-panel-2.23.4/gnome-panel/main.c
+--- gnome-panel-2.23.4/gnome-panel/main.c.preferred-apps 2008-06-17 06:02:08.000000000 -0400
++++ gnome-panel-2.23.4/gnome-panel/main.c 2008-07-18 21:44:07.000000000 -0400
+@@ -28,6 +28,7 @@
+ #include "panel-action-protocol.h"
+ #include "panel-lockdown.h"
+ #include "panel-icon-names.h"
++#include "launcher.h"
+ #include "xstuff.h"
-+GSList *get_all_applications (void);
-+
- G_END_DECLS
+ #include "nothing.cP"
+@@ -86,6 +87,7 @@ main (int argc, char **argv)
+ GCONF_CLIENT_PRELOAD_NONE,
+ NULL);
- #endif /* __PANEL_RUN_DIALOG_H__ */
-diff -up gnome-panel-2.21.91/gnome-panel/panel-run-dialog.c.preferred-apps gnome-panel-2.21.91/gnome-panel/panel-run-dialog.c
---- gnome-panel-2.21.91/gnome-panel/panel-run-dialog.c.preferred-apps 2008-02-11 16:15:47.000000000 -0500
-+++ gnome-panel-2.21.91/gnome-panel/panel-run-dialog.c 2008-02-13 20:44:49.000000000 -0500
-@@ -816,7 +816,7 @@ get_all_applications_from_dir (GMenuTree
++ panel_preferred_apps_init ();
+ panel_global_config_load ();
+ panel_lockdown_init ();
+ panel_profile_load ();
+diff -up gnome-panel-2.23.4/gnome-panel/panel-run-dialog.c.preferred-apps gnome-panel-2.23.4/gnome-panel/panel-run-dialog.c
+--- gnome-panel-2.23.4/gnome-panel/panel-run-dialog.c.preferred-apps 2008-06-17 06:02:08.000000000 -0400
++++ gnome-panel-2.23.4/gnome-panel/panel-run-dialog.c 2008-07-18 21:44:07.000000000 -0400
+@@ -818,7 +818,7 @@ get_all_applications_from_dir (GMenuTree
return list;
}
@@ -254,3 +242,15 @@
get_all_applications (void)
{
GMenuTree *tree;
+diff -up gnome-panel-2.23.4/gnome-panel/panel-run-dialog.h.preferred-apps gnome-panel-2.23.4/gnome-panel/panel-run-dialog.h
+--- gnome-panel-2.23.4/gnome-panel/panel-run-dialog.h.preferred-apps 2008-06-17 06:02:08.000000000 -0400
++++ gnome-panel-2.23.4/gnome-panel/panel-run-dialog.h 2008-07-18 21:44:07.000000000 -0400
+@@ -32,6 +32,8 @@ G_BEGIN_DECLS
+ void panel_run_dialog_present (GdkScreen *screen,
+ guint32 activate_time);
+
++GSList *get_all_applications (void);
++
+ G_END_DECLS
+
+ #endif /* __PANEL_RUN_DIALOG_H__ */
- Previous message (by thread): rpms/NetworkManager-openvpn/devel .cvsignore, 1.6, 1.7 NetworkManager-openvpn.spec, 1.17, 1.18 sources, 1.9, 1.10
- Next message (by thread): rpms/thunar-archive-plugin/devel thunar-archive-plugin-0.2.4-fileroller-extract-here.patch, NONE, 1.1 thunar-archive-plugin.spec, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list