rpms/gnome-panel/devel .cvsignore, 1.79, 1.80 gnome-panel-launch-with-gio.patch, 1.2, 1.3 gnome-panel.spec, 1.309, 1.310 preferred-apps.patch, 1.6, 1.7 sources, 1.82, 1.83
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Wed Jul 23 02:45:46 UTC 2008
Author: mclasen
Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32083
Modified Files:
.cvsignore gnome-panel-launch-with-gio.patch gnome-panel.spec
preferred-apps.patch sources
Log Message:
fix patches
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- .cvsignore 18 Jun 2008 18:01:32 -0000 1.79
+++ .cvsignore 23 Jul 2008 02:44:59 -0000 1.80
@@ -1 +1 @@
-gnome-panel-2.23.4.tar.bz2
+gnome-panel-2.23.5.tar.bz2
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-panel-launch-with-gio.patch 19 Jul 2008 01:57:55 -0000 1.2
+++ gnome-panel-launch-with-gio.patch 23 Jul 2008 02:44:59 -0000 1.3
@@ -1,15 +1,15 @@
-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
+diff -up gnome-panel-2.23.5/gnome-panel/panel-menu-items.c.launch-with-gio gnome-panel-2.23.5/gnome-panel/panel-menu-items.c
+--- gnome-panel-2.23.5/gnome-panel/panel-menu-items.c.launch-with-gio 2008-07-22 22:37:50.000000000 -0400
++++ gnome-panel-2.23.5/gnome-panel/panel-menu-items.c 2008-07-22 22:39:01.000000000 -0400
@@ -41,6 +41,7 @@
#include <libgnome/gnome-url.h>
#include <libgnomeui/gnome-url.h>
+#include <libgnomeui/gnome-password-dialog.h>
+ #include <libpanel-util/panel-glib.h>
#include <libpanel-util/panel-keyfile.h>
-
-@@ -98,6 +99,51 @@ struct _PanelDesktopMenuItemPrivate {
+@@ -99,6 +100,51 @@ struct _PanelDesktopMenuItemPrivate {
guint append_lock_logout : 1;
};
@@ -61,7 +61,7 @@
static void
activate_uri_on_screen (const char *path,
GdkScreen *screen)
-@@ -124,12 +170,28 @@ activate_uri_on_screen (const char *path
+@@ -125,12 +171,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.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
+diff -up gnome-panel-2.23.5/gnome-panel/panel-mount-operation.c.launch-with-gio gnome-panel-2.23.5/gnome-panel/panel-mount-operation.c
+--- gnome-panel-2.23.5/gnome-panel/panel-mount-operation.c.launch-with-gio 2008-07-22 17:50:58.000000000 -0400
++++ gnome-panel-2.23.5/gnome-panel/panel-mount-operation.c 2008-07-22 22:37:50.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.309
retrieving revision 1.310
diff -u -r1.309 -r1.310
--- gnome-panel.spec 19 Jul 2008 01:57:55 -0000 1.309
+++ gnome-panel.spec 23 Jul 2008 02:44:59 -0000 1.310
@@ -22,8 +22,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.23.4
-Release: 5%{?dist}
+Version: 2.23.5
+Release: 1%{?dist}
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar.bz2
@@ -119,9 +119,6 @@
Patch35: clock-wakeups.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=542257
-Patch47: icon-names.patch
-
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -171,7 +168,6 @@
%patch33 -p1 -b .use-gio
%patch34 -p1 -b .launch-with-gio
%patch35 -p1 -b .clock-wakeups
-%patch47 -p1 -b .icon-names
. %{SOURCE6}
@@ -358,6 +354,9 @@
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Jul 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.5-1
+- Update to 2.23.5
+
* Fri Jul 18 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.4-5
- Fix one more icon
preferred-apps.patch:
Index: preferred-apps.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/preferred-apps.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- preferred-apps.patch 19 Jul 2008 01:57:55 -0000 1.6
+++ preferred-apps.patch 23 Jul 2008 02:44:59 -0000 1.7
@@ -1,15 +1,15 @@
-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
+diff -up gnome-panel-2.23.5/gnome-panel/launcher.c.preferred-apps gnome-panel-2.23.5/gnome-panel/launcher.c
+--- gnome-panel-2.23.5/gnome-panel/launcher.c.preferred-apps 2008-07-22 22:20:48.000000000 -0400
++++ gnome-panel-2.23.5/gnome-panel/launcher.c 2008-07-22 22:36:59.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 <libpanel-util/panel-glib.h>
#include <libpanel-util/panel-keyfile.h>
-
-@@ -42,6 +43,7 @@
+@@ -43,6 +44,7 @@
#include "panel-compatibility.h"
#include "panel-ditem-editor.h"
#include "panel-icon-names.h"
@@ -17,7 +17,7 @@
static GdkScreen *
launcher_get_screen (Launcher *launcher)
-@@ -1297,3 +1299,173 @@ panel_launcher_set_dnd_enabled (Launcher
+@@ -1300,3 +1302,173 @@ panel_launcher_set_dnd_enabled (Launcher
} else
gtk_drag_source_unset (launcher->button);
}
@@ -191,9 +191,9 @@
+ filename, g_free, NULL);
+ }
+}
-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
+diff -up gnome-panel-2.23.5/gnome-panel/launcher.h.preferred-apps gnome-panel-2.23.5/gnome-panel/launcher.h
+--- gnome-panel-2.23.5/gnome-panel/launcher.h.preferred-apps 2008-07-22 22:20:48.000000000 -0400
++++ gnome-panel-2.23.5/gnome-panel/launcher.h 2008-07-22 22:20:49.000000000 -0400
@@ -14,6 +14,8 @@
#include "applet.h"
#include "panel-widget.h"
@@ -211,9 +211,9 @@
G_END_DECLS
-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
+diff -up gnome-panel-2.23.5/gnome-panel/main.c.preferred-apps gnome-panel-2.23.5/gnome-panel/main.c
+--- gnome-panel-2.23.5/gnome-panel/main.c.preferred-apps 2008-07-22 17:50:58.000000000 -0400
++++ gnome-panel-2.23.5/gnome-panel/main.c 2008-07-22 22:20:49.000000000 -0400
@@ -28,6 +28,7 @@
#include "panel-action-protocol.h"
#include "panel-lockdown.h"
@@ -230,9 +230,9 @@
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
+diff -up gnome-panel-2.23.5/gnome-panel/panel-run-dialog.c.preferred-apps gnome-panel-2.23.5/gnome-panel/panel-run-dialog.c
+--- gnome-panel-2.23.5/gnome-panel/panel-run-dialog.c.preferred-apps 2008-07-22 17:50:58.000000000 -0400
++++ gnome-panel-2.23.5/gnome-panel/panel-run-dialog.c 2008-07-22 22:20:49.000000000 -0400
@@ -818,7 +818,7 @@ get_all_applications_from_dir (GMenuTree
return list;
}
@@ -242,9 +242,9 @@
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
+diff -up gnome-panel-2.23.5/gnome-panel/panel-run-dialog.h.preferred-apps gnome-panel-2.23.5/gnome-panel/panel-run-dialog.h
+--- gnome-panel-2.23.5/gnome-panel/panel-run-dialog.h.preferred-apps 2008-07-22 17:50:58.000000000 -0400
++++ gnome-panel-2.23.5/gnome-panel/panel-run-dialog.h 2008-07-22 22:20:49.000000000 -0400
@@ -32,6 +32,8 @@ G_BEGIN_DECLS
void panel_run_dialog_present (GdkScreen *screen,
guint32 activate_time);
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/sources,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- sources 18 Jun 2008 18:01:32 -0000 1.82
+++ sources 23 Jul 2008 02:44:59 -0000 1.83
@@ -1 +1 @@
-5fe8148c05a8dab63a08b7db3c5d9ab6 gnome-panel-2.23.4.tar.bz2
+075172fb7a72e8a35df50e99a5a826af gnome-panel-2.23.5.tar.bz2
More information about the fedora-extras-commits
mailing list