Hello community, here is the log from the commit of package gnome-panel checked in at Thu Oct 19 13:29:22 CEST 2006. -------- --- GNOME/gnome-panel/gnome-panel.changes 2006-10-13 07:46:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-panel/gnome-panel.changes 2006-10-16 19:10:31.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Oct 16 19:05:56 CEST 2006 - danw@suse.de + +- Remove dead patches +- Update and re-enable gnome-panel-disable-movement.patch, + gnome-panel-beagle-search.patch, and + gnome-panel-missing-icon-no-dialog.patch +- Replace disabled gnome-panel-in-proc-applets.patch with + new --with-in-process-applets flag + +-------------------------------------------------------------------- Old: ---- gnome-panel-in-proc-applets.patch gnome-panel-show-desktop-scaling.patch launcher-theme-icon.diff menu-item-theme-icon.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-panel.spec ++++++ --- /var/tmp/diff_new_pack.clFZJI/_old 2006-10-19 13:29:00.000000000 +0200 +++ /var/tmp/diff_new_pack.clFZJI/_new 2006-10-19 13:29:00.000000000 +0200 @@ -14,11 +14,11 @@ BuildRequires: evolution-data-server-devel gnome-common gnome-desktop-devel gnome-doc-utils-devel gnome-menus-devel gnome-patch-translation gtkdoc intltool kdelibs3-doc libidl libwnck-devel mDNSResponder-devel perl-XML-Parser scrollkeeper %define prefix /opt/gnome %define sysconfdir /etc%{prefix} -License: LGPL +License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/GUI/GNOME Autoreqprov: on Version: 2.16.1 -Release: 4 +Release: 7 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 @@ -34,8 +34,6 @@ Patch15: gnome-panel-clock-change-date.diff Patch16: gnome-panel-workspaces.patch Patch19: panel-resize-60913.diff -Patch21: menu-item-theme-icon.diff -Patch22: launcher-theme-icon.diff Patch24: panel-vertical-resize-considerably-fix.diff Patch25: gnome-panel-recent-check-exists.patch Patch30: panel-toplevel-size-retain-while-change-orient.diff @@ -43,10 +41,8 @@ Patch34: gnome-panel-beagle-search.patch Patch35: gnome-panel-2-11-bring-back-my-run-item.patch Patch36: gnome-panel-5485-command-history.patch -Patch38: gnome-panel-in-proc-applets.patch Patch39: gnome-panel-no-missing-tomboy-dialog.patch Patch40: gnome-panel-main-menu-name.patch -Patch42: gnome-panel-show-desktop-scaling.patch Patch43: gnome-panel-bonobo-async.patch Patch46: gnome-panel-missing-icon-no-dialog.patch Patch47: gnome-panel-cal-updates-160200.patch @@ -221,27 +217,23 @@ %patch3 -p1 %patch5 -p1 %patch9 -p1 -#%patch10 -p0 +%patch10 -p0 %patch12 -p1 %patch14 -p1 %patch15 %patch16 -p1 %patch19 -#%patch21 -#%patch22 %patch24 %patch25 -p1 %patch30 %patch31 -p1 -#%patch34 +%patch34 %patch35 %patch36 -p1 -#%patch38 %patch39 %patch40 -#%patch42 %patch43 -#%patch46 +%patch46 %patch48 %patch50 %patch51 -p1 @@ -269,7 +261,8 @@ --localstatedir=/var/%_lib \ --with-kde-datadir=/opt/kde3/share \ --disable-scrollkeeper \ - --enable-platform-gnome2 + --enable-platform-gnome2 \ + --with-in-process-applets=all #pushd po; make %{name}*.pot; make update-po; popd make @@ -320,21 +313,15 @@ %doc AUTHORS COPYING ChangeLog NEWS README %defattr (-, root, root) %{prefix}/bin/* -#%{prefix}/%{_lib}/libclock*.so.* -#%{prefix}/%{_lib}/libnotification-area*.so.* %{prefix}/%{_lib}/libpanel*.so.* -#%{prefix}/%{_lib}/libwnck*.so.* -%{prefix}/lib/gnome-applets/clock-applet -%{prefix}/lib/gnome-applets/fish-applet-2 -%{prefix}/lib/gnome-applets/notification-area-applet -%{prefix}/lib/gnome-applets/wnck-applet %{prefix}/%{_lib}/bonobo/servers/GNOME_ClockApplet_Factory.server %{prefix}/%{_lib}/bonobo/servers/GNOME_NotificationAreaApplet.server %{prefix}/%{_lib}/bonobo/servers/GNOME_Panel.server %{prefix}/%{_lib}/bonobo/servers/GNOME_Wncklet_Factory.server -#%{prefix}/%{_lib}/libclock-applet.so -#%{prefix}/%{_lib}/libnotification-area-applet.so -#%{prefix}/%{_lib}/libwnck-applet.so +%{prefix}/%{_lib}/%{name} +%{prefix}/%{_lib}/%{name}/libclock-applet.* +%{prefix}/%{_lib}/%{name}/libnotification-area-applet.* +%{prefix}/%{_lib}/%{name}/libwnck-applet.* %{prefix}/share/gnome/help/* %{prefix}/share/gnome/panel %{prefix}/share/gnome-panelrc @@ -371,13 +358,19 @@ %files extras %defattr (-, root, root) -#%{prefix}/%{_lib}/libfish-applet-2.so -#%{prefix}/%{_lib}/libfish*.so.* +%{prefix}/%{_lib}/%{name}/libfish-applet-2.* %{sysconfdir}/gconf/schemas/fish.schemas %{prefix}/%{_lib}/bonobo/servers/GNOME_FishApplet_Factory.server %{prefix}/share/gnome-2.0/ui/GNOME_FishApplet.xml %changelog -n gnome-panel +* Mon Oct 16 2006 - danw@suse.de +- Remove dead patches +- Update and re-enable gnome-panel-disable-movement.patch, + gnome-panel-beagle-search.patch, and + gnome-panel-missing-icon-no-dialog.patch +- Replace disabled gnome-panel-in-proc-applets.patch with + new --with-in-process-applets flag * Fri Oct 13 2006 - aj@suse.de - Adjust BuildRequires for gnome-doc-utils. * Thu Oct 12 2006 - danw@suse.de ++++++ gnome-panel-beagle-search.patch ++++++ --- /var/tmp/diff_new_pack.clFZJI/_old 2006-10-19 13:29:01.000000000 +0200 +++ /var/tmp/diff_new_pack.clFZJI/_new 2006-10-19 13:29:01.000000000 +0200 @@ -1,49 +1,29 @@ --- gnome-panel/panel-action-button.c +++ gnome-panel/panel-action-button.c -@@ -190,11 +190,11 @@ - GnomeDesktopItem *ditem; - GdkScreen *screen; +@@ -191,16 +191,16 @@ GError *error = NULL; -- char *argv[2] = {"gnome-search-tool", NULL}; -+ char *argv[2] = {"nautilus", "x-nautilus-search:", NULL}; - char *file; screen = gtk_widget_get_screen (widget); -- file = panel_lookup_in_data_dirs ("applications/gnome-search-tool.desktop"); -+ file = panel_lookup_in_data_dirs ("applications/nautilus-search.desktop"); - - if (file) { - ditem = gnome_desktop_item_new_from_file (file, 0, &error); -@@ -205,11 +205,11 @@ - } - if (error) { - panel_error_dialog (screen, -- "cannot_exec_gnome-search-tool", -+ "cannot_exec_nautilus-search", - TRUE, - _("Could not execute '%s'"), - "%s", -- "gnome-search-tool", -+ "nautilus x-nautilus-search", - error->message); - g_error_free (error); - } -@@ -219,10 +219,10 @@ - G_SPAWN_SEARCH_PATH, - NULL, NULL, NULL, &error)) { - panel_error_dialog (screen, +- panel_launch_desktop_file ("gnome-search-tool.desktop", +- "gnome-search-tool", ++ panel_launch_desktop_file ("nautilus-search.desktop", ++ NULL, + screen, + &error); + if (error) { + char *primary; + primary = g_strdup_printf (_("Could not execute '%s'"), +- "gnome-search-tool"); ++ "nautilus x-nautilus-search:"); + panel_error_dialog (NULL, screen, - "cannot_exec_gnome-search-tool", TRUE, + "cannot_exec_nautilus-search", TRUE, - _("Could not execute '%s'"), - "%s", -- "gnome-search-tool", -+ "nautilus x-nautilus-search", - error->message); + primary, error->message); + g_free (primary); g_error_free (error); - } --- gnome-panel/panel-menu-items.c +++ gnome-panel/panel-menu-items.c -@@ -617,7 +617,7 @@ +@@ -628,7 +628,7 @@ add_menu_separator (places_menu); panel_menu_items_append_from_desktop (places_menu, @@ -51,4 +31,4 @@ + "nautilus-search.desktop", NULL); - *recent_view = panel_recent_append_documents_menu (places_menu, + panel_recent_append_documents_menu (places_menu, ++++++ gnome-panel-disable-movement.patch ++++++ --- /var/tmp/diff_new_pack.clFZJI/_old 2006-10-19 13:29:01.000000000 +0200 +++ /var/tmp/diff_new_pack.clFZJI/_new 2006-10-19 13:29:01.000000000 +0200 @@ -1,54 +1,51 @@ -Index: gnome-panel/panel-context-menu.c -================================================================================ --- gnome-panel/panel-context-menu.c +++ gnome-panel/panel-context-menu.c -@@ -151,6 +151,21 @@ +@@ -158,6 +158,20 @@ } static void -+cb_disable_movement_activate (GtkWidget *menuitem) ++panel_context_menu_enable_disable_move (GtkWidget *menuitem, ++ PanelToplevel *toplevel) +{ -+ PanelWidget *panel_widget; -+ gboolean disable_movement; ++ gboolean disable_movement; + -+ panel_widget = menu_get_panel (menuitem); -+ disable_movement = panel_profile_get_toplevel_disable_movement (panel_widget->toplevel); -+ -+ gtk_label_set_label (GTK_LABEL (GTK_BIN(menuitem)->child), -+ disable_movement ? _("_Lock Panel Postion") :_( "_Allow Panel to be Moved")); -+ -+ panel_profile_set_toplevel_disable_movement (panel_widget->toplevel, !disable_movement); ++ disable_movement = panel_profile_get_toplevel_disable_movement (toplevel); ++ ++ gtk_label_set_label (GTK_LABEL (GTK_BIN (menuitem)->child), ++ disable_movement ? _("_Lock Panel Position") : _("A_llow Panel to be Moved")); ++ ++ panel_profile_set_toplevel_disable_movement (toplevel, !disable_movement); +} + +static void - panel_context_menu_remove_panel (GtkWidget *menuitem, - gpointer data) + panel_context_menu_delete_panel (PanelToplevel *toplevel) { -@@ -222,6 +237,7 @@ - make_panel_submenu (PanelWidget *panel_widget, - GtkWidget *menu) + if (panel_toplevel_is_last_unattached (toplevel)) { +@@ -195,6 +209,7 @@ + panel_context_menu_build_edition (PanelWidget *panel_widget, + GtkWidget *menu) { + gboolean disable_movement; GtkWidget *menuitem; menuitem = gtk_image_menu_item_new (); -@@ -270,6 +286,20 @@ +@@ -243,6 +258,20 @@ add_menu_separator (menu); menuitem = gtk_image_menu_item_new (); -+ + disable_movement = panel_profile_get_toplevel_disable_movement (panel_widget->toplevel); + setup_menuitem (menuitem, + GTK_ICON_SIZE_MENU, -+ gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION, GTK_ICON_SIZE_MENU), -+ disable_movement ? _("_Allow Panel to be Moved") : _("_Lock Panel Postion"), ++ gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION, ++ GTK_ICON_SIZE_MENU), ++ disable_movement ? _("A_llow Panel to be Moved") : _("_Lock Panel Position"), + FALSE); -+ ++ + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + g_signal_connect (menuitem, "activate", -+ G_CALLBACK (cb_disable_movement_activate), -+ menuitem); -+ ++ G_CALLBACK (panel_context_menu_enable_disable_move), ++ panel_widget->toplevel); ++ + menuitem = gtk_image_menu_item_new (); setup_menuitem (menuitem, GTK_ICON_SIZE_MENU, @@ -106,7 +103,7 @@ <owner>panel</owner> --- gnome-panel/panel-profile.c +++ gnome-panel/panel-profile.c -@@ -532,6 +532,19 @@ +@@ -547,6 +547,19 @@ gconf_client_unset (client, key, NULL); } @@ -126,7 +123,7 @@ char * panel_profile_get_toplevel_name (PanelToplevel *toplevel) { -@@ -549,6 +562,19 @@ +@@ -564,6 +577,19 @@ TOPLEVEL_IS_WRITABLE_FUNC ("name", toplevel, name) @@ -160,7 +157,7 @@ int panel_profile_get_toplevel_size (PanelToplevel *toplevel); --- gnome-panel/panel-properties-dialog.c +++ gnome-panel/panel-properties-dialog.c -@@ -73,6 +73,7 @@ +@@ -74,6 +74,7 @@ guint toplevel_notify; guint background_notify; @@ -168,7 +165,7 @@ /* The theme directory of the icon, see bug #119209 */ char *icon_theme_dir; -@@ -95,6 +96,10 @@ +@@ -96,6 +97,10 @@ gconf_client_notify_remove (client, dialog->background_notify); dialog->background_notify = 0; @@ -179,7 +176,7 @@ if (dialog->properties_dialog) gtk_widget_destroy (dialog->properties_dialog); dialog->properties_dialog = NULL; -@@ -146,6 +151,24 @@ +@@ -147,6 +152,24 @@ } static void @@ -204,7 +201,7 @@ panel_properties_dialog_setup_orientation_combo (PanelPropertiesDialog *dialog, GladeXML *gui) { -@@ -190,7 +213,7 @@ +@@ -191,7 +214,7 @@ G_CALLBACK (panel_properties_dialog_orientation_changed), dialog); @@ -213,7 +210,7 @@ gtk_widget_set_sensitive (dialog->orientation_combo, FALSE); gtk_widget_set_sensitive (dialog->orientation_label, FALSE); gtk_widget_show (dialog->writability_warn_general); -@@ -920,6 +943,13 @@ +@@ -956,6 +979,13 @@ panel_properties_dialog_setup_hidebuttons_toggle (dialog, gui); panel_properties_dialog_setup_arrows_toggle (dialog, gui); @@ -229,7 +226,7 @@ g_signal_connect_swapped (dialog->hidebuttons_toggle, "toggled", --- gnome-panel/panel-toplevel.c +++ gnome-panel/panel-toplevel.c -@@ -423,7 +423,8 @@ +@@ -428,7 +428,8 @@ toplevel->priv->grab_op != PANEL_GRAB_OP_NONE) return; ++++++ gnome-panel-missing-icon-no-dialog.patch ++++++ --- /var/tmp/diff_new_pack.clFZJI/_old 2006-10-19 13:29:01.000000000 +0200 +++ /var/tmp/diff_new_pack.clFZJI/_new 2006-10-19 13:29:01.000000000 +0200 @@ -1,19 +1,38 @@ -? gnome-panel-missing-icon-no-dialog.patch -Index: gnome-panel/button-widget.c -================================================================================ --- gnome-panel/button-widget.c +++ gnome-panel/button-widget.c -@@ -193,11 +193,8 @@ +@@ -192,32 +192,16 @@ + button->orientation & PANEL_VERTICAL_MASK ? button->size : -1, button->orientation & PANEL_HORIZONTAL_MASK ? button->size : -1, &error); - if (error) { -- panel_error_dialog (gdk_screen_get_default (), -- "cannot_load_pixbuf", TRUE, -- _("Could not load icon"), -- "%s", -- error); +- if (error && button->no_icon_dialog == NULL) { +- button->no_icon_dialog = panel_error_dialog ( +- NULL, gdk_screen_get_default (), +- "cannot_load_pixbuf", TRUE, +- _("Could not load icon"), error); ++ if (error) { + g_warning ("Failed to load image '%s' : %s", -+ button->filename, error); ++ button->filename, error); g_free (error); +- +- g_signal_connect (button->no_icon_dialog, "destroy", +- G_CALLBACK (gtk_widget_destroyed), +- &button->no_icon_dialog); +- +- g_signal_connect_swapped (button, "destroy", +- G_CALLBACK (gtk_widget_destroy), +- button->no_icon_dialog); +- } else if (error) { +- gtk_window_set_screen (GTK_WINDOW (button->no_icon_dialog), +- gtk_widget_get_screen (GTK_WIDGET (button))); +- gtk_window_present (GTK_WINDOW (button->no_icon_dialog)); } } + + if (button->pixbuf == NULL) + button->pixbuf = get_missing (button->icon_theme, + button->size); +- else if (button->no_icon_dialog != NULL) +- gtk_widget_destroy (button->no_icon_dialog); + + if (button->pixbuf == NULL) + return; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org