Mailinglist Archive: opensuse-commit (1500 mails)

< Previous

Hello community,

here is the log from the commit of package gnome-panel
checked in at Wed Nov 1 01:35:36 CET 2006.

--------
--- GNOME/gnome-panel/gnome-panel.changes 2006-10-19 15:38:45.000000000 +0200
+++ /mounts/work_src_done/STABLE/gnome-panel/gnome-panel.changes 2006-10-31 16:46:09.000000000 +0100
@@ -1,0 +2,10 @@
+Mon Oct 30 23:55:08 CET 2006 - danw@xxxxxxx
+
+- Add gnome-panel-202076-root-launchers.patch to reenable
+ X-KDE-SubstituteUID support in launchers (which got broken by an
+ upstream rewrite to not use GnomeDesktopItem)
+- Fix gnome-panel-run-fixes.patch to not crash when a desktop
+ file points to a non-existent binary and not pop up two error
+ dialogs if a command can't be run. #213903
+
+-------------------------------------------------------------------

New:
----
gnome-panel-202076-root-launchers.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gnome-panel.spec ++++++
--- /var/tmp/diff_new_pack.m4zKlO/_old 2006-11-01 01:35:06.000000000 +0100
+++ /var/tmp/diff_new_pack.m4zKlO/_new 2006-11-01 01:35:06.000000000 +0100
@@ -18,7 +18,7 @@
Group: System/GUI/GNOME
Autoreqprov: on
Version: 2.16.1
-Release: 9
+Release: 16
Summary: The GNOME 2.x Desktop Panel
Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.11/gnome-panel-%{version}.tar.bz2
URL: http://www.gnome.org
@@ -52,6 +52,7 @@
Patch52: gnome-panel-build-warning.patch
Patch53: gnome-panel-204645-variable-init.patch
Patch54: gnome-panel-bgo-363309-variable-init.patch
+Patch55: gnome-panel-202076-root-launchers.patch
Obsoletes: gnome-core gnome-panel-nld

%description
@@ -242,6 +243,7 @@
%patch52
%patch53
%patch54
+%patch55
# this is for the gnome-panel-corners.patch
# which has been temporarily removed for reworking
#cd icons
@@ -368,6 +370,13 @@
%{prefix}/share/gnome-2.0/ui/GNOME_FishApplet.xml

%changelog -n gnome-panel
+* Mon Oct 30 2006 - danw@xxxxxxx
+- Add gnome-panel-202076-root-launchers.patch to reenable
+ X-KDE-SubstituteUID support in launchers (which got broken by an
+ upstream rewrite to not use GnomeDesktopItem)
+- Fix gnome-panel-run-fixes.patch to not crash when a desktop
+ file points to a non-existent binary and not pop up two error
+ dialogs if a command can't be run. #213903
* Thu Oct 19 2006 - jpr@xxxxxxx
- Initialize location variable properly (#204645)
- Initialize comparison variables properly (bgo #363309)

++++++ gnome-panel-202076-root-launchers.patch ++++++
--- gnome-panel/panel-util.c
+++ gnome-panel/panel-util.c
@@ -73,6 +73,8 @@
"TerminalOptions",
"StartupNotify",
"StartupWMClass",
+ "X-KDE-SubstituteUID",
+ "X-KDE-RootOnly",
};

g_return_if_fail (keyfile != NULL);
++++++ gnome-panel-204645-variable-init.patch ++++++
--- /var/tmp/diff_new_pack.m4zKlO/_old 2006-11-01 01:35:07.000000000 +0100
+++ /var/tmp/diff_new_pack.m4zKlO/_new 2006-11-01 01:35:07.000000000 +0100
@@ -4,12 +4,9 @@
initialized.

Index: gnome-panel/launcher.c
-===================================================================
-RCS file: /cvs/gnome/gnome-panel/gnome-panel/launcher.c,v
-retrieving revision 1.293
-diff -u -r1.293 launcher.c
---- gnome-panel/launcher.c 1 Oct 2006 12:39:40 -0000 1.293
-+++ gnome-panel/launcher.c 4 Oct 2006 20:20:29 -0000
+================================================================================
+--- gnome-panel/launcher.c
++++ gnome-panel/launcher.c
@@ -305,7 +305,8 @@
if (!launcher->location)
return;

++++++ gnome-panel-alt-f1-slab.patch ++++++
--- /var/tmp/diff_new_pack.m4zKlO/_old 2006-11-01 01:35:07.000000000 +0100
+++ /var/tmp/diff_new_pack.m4zKlO/_new 2006-11-01 01:35:07.000000000 +0100
@@ -1,5 +1,5 @@
---- gnome-panel-2.15.91/gnome-panel/panel-action-protocol.c
-+++ gnome-panel-2.15.91/gnome-panel/panel-action-protocol.c
+--- gnome-panel-2.16.1/gnome-panel/panel-action-protocol.c
++++ gnome-panel-2.16.1/gnome-panel/panel-action-protocol.c
@@ -50,6 +50,7 @@
PanelWidget *panel_widget;
GtkWidget *menu;

++++++ gnome-panel-run-fixes.patch ++++++
--- /var/tmp/diff_new_pack.m4zKlO/_old 2006-11-01 01:35:07.000000000 +0100
+++ /var/tmp/diff_new_pack.m4zKlO/_new 2006-11-01 01:35:07.000000000 +0100
@@ -1,11 +1,8 @@
Index: gnome-panel/panel-run-dialog.c
-===================================================================
-RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-run-dialog.c,v
-retrieving revision 1.72
-diff -u -p -r1.72 panel-run-dialog.c
---- gnome-panel/panel-run-dialog.c 7 Aug 2006 21:07:46 -0000 1.72
-+++ gnome-panel/panel-run-dialog.c 12 Oct 2006 17:51:16 -0000
-@@ -223,6 +223,104 @@ panel_run_dialog_set_icon (PanelRunDialo
+================================================================================
+--- gnome-panel/panel-run-dialog.c
++++ gnome-panel/panel-run-dialog.c
+@@ -223,6 +223,105 @@
}
}

@@ -72,7 +69,8 @@
+ desktop_path);
+ panel_error_dialog (GTK_WINDOW (dialog->run_dialog), NULL,
+ "cannot_open_desktop_item", TRUE,
-+ primary, error->message);
++ primary,
++ error ? error->message : g_strerror (ENOENT));
+ g_free (primary);
+ g_error_free (error);
+ return FALSE;
@@ -110,22 +108,41 @@
static gboolean
command_is_executable (const char *command)
{
-@@ -402,8 +500,12 @@ panel_run_dialog_execute (PanelRunDialog
+@@ -274,9 +373,6 @@
+ char **argv;
+ int argc;
+
+- if (!command_is_executable (command))
+- return FALSE;
+-
+ argc = 3;
+ argv = g_new0 (char *, 4);
+ argv [0] = gnome_util_user_shell ();
+@@ -402,17 +498,13 @@
scheme = gnome_vfs_get_uri_scheme (url);
result = FALSE;

- if (!g_ascii_strcasecmp (scheme, "http") ||
- !g_ascii_strcasecmp (scheme, "file"))
+- /* If this returns an http or file url, the url might refer to a
+- * command that is somewhere in the path or an executable file.
+- * So try executing it before displaying it. We execute the
+- * command in the user's shell so that it can do all the parameter
+- * expansion and other magic for us.
+- */
+ if (dialog->desktop_path)
+ result = panel_run_dialog_launch_ditem (dialog, dialog->desktop_path, disk, escaped);
-+
-+ if (!result &&
-+ (!g_ascii_strcasecmp (scheme, "http") ||
-+ !g_ascii_strcasecmp (scheme, "file")))
- /* If this returns an http or file url, the url might refer to a
- * command that is somewhere in the path or an executable file.
- * So try executing it before displaying it. We execute the
-@@ -588,6 +690,7 @@ panel_run_dialog_find_command_idle (Pane
++ else if ((!g_ascii_strcasecmp (scheme, "http") ||
++ !g_ascii_strcasecmp (scheme, "file")) &&
++ command_is_executable (disk))
+ result = panel_run_dialog_launch_command (dialog, disk, escaped);
+-
+- if (!result)
++ else
+ result = panel_run_dialog_show_url (dialog, url, escaped);
+
+ if (result) {
+@@ -588,6 +680,7 @@
const char *text;
char *found_icon;
char *found_name;
@@ -133,7 +150,7 @@
gboolean fuzzy;

model = GTK_TREE_MODEL (dialog->program_list_store);
-@@ -595,6 +698,7 @@ panel_run_dialog_find_command_idle (Pane
+@@ -595,6 +688,7 @@
text = sure_string (gtk_entry_get_text (GTK_ENTRY (dialog->gtk_entry)));
found_icon = NULL;
found_name = NULL;
@@ -141,7 +158,7 @@
fuzzy = FALSE;

if (!path || !gtk_tree_model_get_iter (model, &iter, path)) {
-@@ -612,12 +716,14 @@ panel_run_dialog_find_command_idle (Pane
+@@ -612,12 +706,14 @@
char *icon = NULL;
char *name = NULL;
char *comment = NULL;
@@ -156,7 +173,7 @@
-1);

if (!fuzzy && exec && icon &&
-@@ -627,6 +733,7 @@ panel_run_dialog_find_command_idle (Pane
+@@ -627,6 +723,7 @@

found_icon = g_strdup (icon);
found_name = g_strdup (name);
@@ -164,7 +181,7 @@

gtk_list_store_set (dialog->program_list_store,
&iter,
-@@ -667,6 +774,8 @@ panel_run_dialog_find_command_idle (Pane
+@@ -667,6 +764,8 @@

g_free (dialog->item_name);
dialog->item_name = found_name;
@@ -173,13 +190,8 @@

dialog->find_command_idle_id = 0;
return FALSE;
-Index: gnome-panel/panel-util.c
-===================================================================
-RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-util.c,v
-retrieving revision 1.169
-diff -u -p -r1.169 panel-util.c
---- gnome-panel/panel-util.c 6 Sep 2006 17:39:01 -0000 1.169
-+++ gnome-panel/panel-util.c 12 Oct 2006 17:51:16 -0000
+--- gnome-panel/panel-util.c
++++ gnome-panel/panel-util.c
@@ -35,7 +35,7 @@
#include "panel-globals.h"
#include "launcher.h"
@@ -189,13 +201,8 @@
panel_ditem_launch (GnomeDesktopItem *item,
GList *file_list,
GdkScreen *screen,
-Index: gnome-panel/panel-util.h
-===================================================================
-RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-util.h,v
-retrieving revision 1.94
-diff -u -p -r1.94 panel-util.h
---- gnome-panel/panel-util.h 9 Aug 2006 14:02:12 -0000 1.94
-+++ gnome-panel/panel-util.h 12 Oct 2006 17:51:16 -0000
+--- gnome-panel/panel-util.h
++++ gnome-panel/panel-util.h
@@ -2,6 +2,7 @@
#define PANEL_UTIL_H

@@ -204,14 +211,14 @@

G_BEGIN_DECLS

-@@ -18,6 +19,10 @@ void panel_util_launch_from_k
- GError **error);
- void panel_launch_desktop_file (const char *desktop_file,
+@@ -20,6 +21,10 @@
const char *fallback_exec,
-+ GdkScreen *screen,
-+ GError **error);
-+int panel_ditem_launch (GnomeDesktopItem *item,
-+ GList *file_list,
GdkScreen *screen,
GError **error);
++int panel_ditem_launch (GnomeDesktopItem *item,
++ GList *file_list,
++ GdkScreen *screen,
++ GError **error);

+ void panel_show_help (GdkScreen *screen,
+ const char *path,

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous

Next >

Mailinglist Archive: opensuse-commit (1500 mails)

commit gnome-panel

Search this list

List Navigation

This Thread