Hello community,
here is the log from the commit of package gnome-panel
checked in at Sun Aug 6 21:52:16 CEST 2006.
--------
--- GNOME/gnome-panel/gnome-panel.changes 2006-05-23 18:00:20.000000000 +0200
+++ gnome-panel/gnome-panel.changes 2006-08-05 00:32:33.000000000 +0200
@@ -1,0 +2,75 @@
+Sat Aug 5 00:18:53 CEST 2006 - gekker@suse.de
+
+- Update to version 2.14.2
+- Remove upstreamed patches
+- Merge in configuration from gnome-panel-nld
+ Panel
+ * Fix closing of About dialog (Vincent)
+ * Don't show an empty label for local URI that are not file: URI in
+ the bookmarks (Vincent)
+ * Always canonicalize URIs in launchers before showing them (Vincent)
+ * Remove the Suspend button on the logout dialog (this is not a
+ regression wrt 2.12) (Vincent)
+ * Fix underscores not being visible in menu items (Vincent)
+ * Don't reboot/shutdown immediately if other users are connected
+ (Vincent)
+ * Don't display the Shut Down item if GDM is not running (Vincent)
+ * Use GOption instead of popt (Vincent)
+ * Put logout dialogs above all windows and on all workspaces (Vincent)
+ * Show the logout dialog on the correct screen (Vincent)
+ * Fix crashes
+ * Fix search of application launchers in "Add to panel" dialog
+ (Vincent)
+ * Fix potential crash when there's an error loading an applet (Vincent)
+ * Update libegg code (Vincent)
+ * Fix crash when logout dialogs are closed by the window manager
+ (Vincent)
+ * Look in the XDG data dirs when loading a .desktop file, so we don't
+ need the whole path (Vincent)
+ * Update default panel config to just use basenames for .desktop files
+ (Vincent)
+ * Remove the screenshot action button and migrates the existing config
+ to use gnome-screenshot.desktop (Vincent)
+ * Make image with transparency backgrounds work (Vincent)
+ * Add CD recording item to the Places menu (Sébastien Bacher)
+ * Add a search entry to the "add to panel" dialog (Vincent)
+ * Re-cache the applications menu when reloading it after there has been
+ some fam/gamin/inotify events (Vincent)
+ * Add a preview widget in the image background chooser (Vincent)
+ * Update the known applications list while typing and only show the
+ items that match (Vincent)
+ * Use a close button instead of the cancel one in the "add to panel"
+ dialog (Claudio Saavedra)
+ * Add tooltips for the menu bar (Vincent, Christian Kirbach)
+ * Don't do something on double/triple clicks for buttons (Vincent)
+ * Make applet handles handle transparency (Ryan Lortie, Vincent)
+ * Fix auto-hide panel not autohiding after the "Delete dialog" has been
+ opened (Vincent)
+ * Synchronize the way remote bookmarks are displayed with nautilus
+ (Vincent)
+ * Don't display error when an url show is canceled (Christian Neumair)
+ libpanel-applet
+ * Fix tiling for image backgrounds (Vincent)
+ * Add new API to automatically update the background of a widget
+ (Ryan Lortie, Vincent)
+ * Fix bookmarks with spaces (Vincent)
+ * Display bookmarks in the same way than nautilus (Vincent)
+ * Don't set the background multiple times on startup (Vincent)
+ * Fix searching in the application list of the run dialog (Vincent)
+ * Change default panel size to 24 (Vincent)
+ * Change the way we report orientation to applets (Vincent)
+ Applets
+ * Fix closing of About dialogs (Vincent)
+ * use new libpanel-applet API for the background (Vincent)
+ Clock Applet
+ * Launch evolution on the clicked day (Tollef Fog Heen, Vincent)
+ * Don't offer the 12-hour format to the user if his locale don't
+ support it (Vincent)
+ * Make task activation work correctly (William Jon McCann)
+ * Sort tasks by due date if priorities are the same (kraai@ftbfs.org)
+ * Don't show the date by default (Vincent)
+ Show Desktop Applet
+ * Use less padding for the focus so the icon doesn't get trimmed
+ (Rodney Dawes)
+
+-------------------------------------------------------------------
Old:
----
gnome-panel-2-11-show-desktop-border.patch
gnome-panel-2.12.2.tar.bz2
gnome-panel-323996.patch
gnome-panel-recently-used-apps.patch
gnome-panel-transparency.patch
New:
----
gnome-panel-2.14.2.tar.bz2
gnome-panel-menu-bar-migrate.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-panel.spec ++++++
--- /var/tmp/diff_new_pack.aqTl6h/_old 2006-08-06 21:52:01.000000000 +0200
+++ /var/tmp/diff_new_pack.aqTl6h/_new 2006-08-06 21:52:01.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package gnome-panel (Version 2.12.2)
+# spec file for package gnome-panel (Version 2.14.2)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,20 +11,20 @@
# norootforbuild
Name: gnome-panel
-BuildRequires: evolution-data-server-devel gnome-common gnome-desktop-devel gnome-doc-utils gnome-menus-devel gnome-patch-translation gtkdoc intltool kdelibs3-doc libglade2-devel libidl libwnck-devel perl-XML-Parser scrollkeeper sharutils
+BuildRequires: evolution-data-server-devel gnome-common gnome-desktop-devel gnome-doc-utils gnome-menus-devel gnome-patch-translation gtkdoc indent intltool kdelibs3-doc libgnomeprintui-devel libidl libwnck-devel mDNSResponder-devel mozilla-nss-devel perl-XML-Parser scrollkeeper sharutils
%define prefix /opt/gnome
%define sysconfdir /etc%{prefix}
License: LGPL
Group: System/GUI/GNOME
Autoreqprov: on
-Version: 2.12.2
-Release: 42
+Version: 2.14.2
+Release: 1
Summary: The GNOME 2.x Desktop Panel
-Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.11/%{name}-%{version}.tar.bz2
+Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.11/gnome-panel-%{version}.tar.bz2
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: filesystem /usr/bin/touch gconf2
-Requires: control-center2 gnome-themes evolution-data-server
+Requires: control-center2 gnome-themes gnome-main-menu evolution-data-server
Patch3: gnome-panel-layout.patch
Patch5: gnome-panel-big-icons.patch
Patch9: gnome-panel-novell-corner.patch
@@ -40,23 +40,20 @@
Patch25: gnome-panel-recent-check-exists.patch
Patch30: panel-toplevel-size-retain-while-change-orient.diff
Patch31: gnome-panel-help-item.patch
-Patch33: gnome-panel-2-11-show-desktop-border.patch
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
-Patch41: gnome-panel-323996.patch
Patch42: gnome-panel-show-desktop-scaling.patch
Patch43: gnome-panel-bonobo-async.patch
-Patch44: gnome-panel-transparency.patch
-Patch45: gnome-panel-recently-used-apps.patch
Patch46: gnome-panel-missing-icon-no-dialog.patch
Patch47: gnome-panel-cal-updates-160200.patch
+Patch48: gnome-panel-menu-bar-migrate.patch
Patch50: gnome-panel-run-fixes.patch
Patch51: gnome-panel-alt-f1-slab.patch
-Obsoletes: gnome-core
+Obsoletes: gnome-core gnome-panel-nld
%description
This package contains the GNOME 2.x Desktop Panel. The panel is an
@@ -99,6 +96,7 @@
Group: System/GUI/GNOME
Autoreqprov: on
Requires: %{name} = %{version} gtk2-devel libgnomeui-devel libbonoboui-devel libglade2-devel
+Obsoletes: gnome-panel-nld-devel
%description devel
This package contains all necessary include files and libraries needed
@@ -139,6 +137,7 @@
Summary: Additional Package Documentation.
Group: System/GUI/GNOME
Requires: %{name} = %{version}
+Obsoletes: gnome-panel-nld-doc
%description doc
This package contains optional documentation provided in addition to
@@ -179,6 +178,7 @@
Summary: Extra panel applets
Group: System/GUI/GNOME
Requires: %{name} = %{version} fortune
+Obsoletes: gnome-panel-nld-extras
%description extras
This package contains extra panel applets such as Wanda the fish.
@@ -215,7 +215,7 @@
Wanda The Fish
%prep
-%setup
+%setup -n gnome-panel-%{version}
gnome-patch-translation-prepare
%patch3 -p1
%patch5 -p1
@@ -232,20 +232,16 @@
%patch25 -p1
%patch30
%patch31 -p1
-%patch33
%patch34
%patch35
%patch36 -p1
%patch38
%patch39
%patch40
-%patch41
%patch42
%patch43
-%patch44
-%patch45
%patch46
-%patch47
+%patch48
%patch50
%patch51 -p1
# this is for the gnome-panel-corners.patch
@@ -259,8 +255,6 @@
gnome-patch-translation-update
%build
-rename no nb po/no.*
-sed "s/\(ALL_LINGUAS.*\) no /\1 nb /" configure.in > configure.in.tmp && mv configure.in.tmp configure.in
%{?suse_update_config:%{suse_update_config -f}}
# Needed for patch8, requires gtkdoc gnome-common
autoreconf -f -i
@@ -290,7 +284,7 @@
meinproc --check --cache `echo $xml | sed 's/xml$/cache.bz2/'` $xml || :
fi
done
-%find_lang %{name}-2.0
+%find_lang gnome-panel-2.0
%post
%run_ldconfig
@@ -321,7 +315,7 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%files -f %files -f %{name}-2.0.lang
+%files -f %files -f gnome-panel-2.0.lang
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README
%defattr (-, root, root)
@@ -380,6 +374,78 @@
%{prefix}/share/gnome-2.0/ui/GNOME_FishApplet.xml
%changelog -n gnome-panel
+* Sat Aug 05 2006 - gekker@suse.de
+- Update to version 2.14.2
+- Remove upstreamed patches
+- Merge in configuration from gnome-panel-nld
+ Panel
+ * Fix closing of About dialog (Vincent)
+ * Don't show an empty label for local URI that are not file: URI in
+ the bookmarks (Vincent)
+ * Always canonicalize URIs in launchers before showing them (Vincent)
+ * Remove the Suspend button on the logout dialog (this is not a
+ regression wrt 2.12) (Vincent)
+ * Fix underscores not being visible in menu items (Vincent)
+ * Don't reboot/shutdown immediately if other users are connected
+ (Vincent)
+ * Don't display the Shut Down item if GDM is not running (Vincent)
+ * Use GOption instead of popt (Vincent)
+ * Put logout dialogs above all windows and on all workspaces (Vincent)
+ * Show the logout dialog on the correct screen (Vincent)
+ * Fix crashes
+ * Fix search of application launchers in "Add to panel" dialog
+ (Vincent)
+ * Fix potential crash when there's an error loading an applet (Vincent)
+ * Update libegg code (Vincent)
+ * Fix crash when logout dialogs are closed by the window manager
+ (Vincent)
+ * Look in the XDG data dirs when loading a .desktop file, so we don't
+ need the whole path (Vincent)
+ * Update default panel config to just use basenames for .desktop files
+ (Vincent)
+ * Remove the screenshot action button and migrates the existing config
+ to use gnome-screenshot.desktop (Vincent)
+ * Make image with transparency backgrounds work (Vincent)
+ * Add CD recording item to the Places menu (Sébastien Bacher)
+ * Add a search entry to the "add to panel" dialog (Vincent)
+ * Re-cache the applications menu when reloading it after there has been
+ some fam/gamin/inotify events (Vincent)
+ * Add a preview widget in the image background chooser (Vincent)
+ * Update the known applications list while typing and only show the
+ items that match (Vincent)
+ * Use a close button instead of the cancel one in the "add to panel"
+ dialog (Claudio Saavedra)
+ * Add tooltips for the menu bar (Vincent, Christian Kirbach)
+ * Don't do something on double/triple clicks for buttons (Vincent)
+ * Make applet handles handle transparency (Ryan Lortie, Vincent)
+ * Fix auto-hide panel not autohiding after the "Delete dialog" has been
+ opened (Vincent)
+ * Synchronize the way remote bookmarks are displayed with nautilus
+ (Vincent)
+ * Don't display error when an url show is canceled (Christian Neumair)
+ libpanel-applet
+ * Fix tiling for image backgrounds (Vincent)
+ * Add new API to automatically update the background of a widget
+ (Ryan Lortie, Vincent)
+ * Fix bookmarks with spaces (Vincent)
+ * Display bookmarks in the same way than nautilus (Vincent)
+ * Don't set the background multiple times on startup (Vincent)
+ * Fix searching in the application list of the run dialog (Vincent)
+ * Change default panel size to 24 (Vincent)
+ * Change the way we report orientation to applets (Vincent)
+ Applets
+ * Fix closing of About dialogs (Vincent)
+ * use new libpanel-applet API for the background (Vincent)
+ Clock Applet
+ * Launch evolution on the clicked day (Tollef Fog Heen, Vincent)
+ * Don't offer the 12-hour format to the user if his locale don't
+ support it (Vincent)
+ * Make task activation work correctly (William Jon McCann)
+ * Sort tasks by due date if priorities are the same (kraai@ftbfs.org)
+ * Don't show the date by default (Vincent)
+ Show Desktop Applet
+ * Use less padding for the focus so the icon doesn't get trimmed
+ (Rodney Dawes)
* Tue May 23 2006 - danw@suse.de
- Remove gnome-panel-window-list-default.patch, since we apparently
now prefer the upstream default. #177979.
++++++ gnome-panel-2-11-bring-back-my-run-item.patch ++++++
--- /var/tmp/diff_new_pack.aqTl6h/_old 2006-08-06 21:52:01.000000000 +0200
+++ /var/tmp/diff_new_pack.aqTl6h/_new 2006-08-06 21:52:01.000000000 +0200
@@ -2,7 +2,7 @@
================================================================================
--- gnome-panel/menu.c
+++ gnome-panel/menu.c
-@@ -1741,6 +1741,12 @@
+@@ -1780,6 +1780,12 @@
gtk_menu_shell_append (GTK_MENU_SHELL (main_menu), item);
gtk_widget_show (item);
@@ -84,9 +84,9 @@
+ return applications_menu;
+}
- static void
- panel_menu_bar_instance_init (PanelMenuBar *menubar,
-@@ -74,7 +136,7 @@
+ static gboolean
+ panel_menu_bar_enter_applications (GtkWidget *widget,
+@@ -178,7 +240,7 @@
menubar->priv->info = NULL;
@@ -95,17 +95,17 @@
menubar->priv->applications_item = gtk_image_menu_item_new_with_label (_("Applications"));
image = gtk_image_new_from_icon_name (PANEL_GNOME_LOGO_ICON,
-@@ -94,6 +156,9 @@
- menubar->priv->desktop_item = panel_desktop_menu_item_new (FALSE, TRUE);
+@@ -199,6 +261,9 @@
gtk_menu_shell_append (GTK_MENU_SHELL (menubar),
menubar->priv->desktop_item);
-+
+
+ panel_lockdown_notify_add (G_CALLBACK (panel_menu_bar_recreate_menus),
+ menubar);
++
+ panel_menu_bar_setup_tooltip (menubar);
}
- static void
-@@ -185,6 +250,17 @@
+@@ -298,6 +363,17 @@
}
static void
@@ -123,7 +123,7 @@
panel_menu_bar_class_init (PanelMenuBarClass *klass)
{
GObjectClass *gobject_class = (GObjectClass *) klass;
-@@ -195,6 +271,7 @@
+@@ -308,6 +384,7 @@
gobject_class->get_property = panel_menu_bar_get_property;
gobject_class->set_property = panel_menu_bar_set_property;
@@ -131,3 +131,25 @@
widget_class->parent_set = panel_menu_bar_parent_set;
widget_class->size_allocate = panel_menu_bar_size_allocate;
+--- gnome-panel/panel-menu-items.c
++++ gnome-panel/panel-menu-items.c
+@@ -280,7 +280,7 @@
+ return item;
+ }
+
+-static GtkWidget *
++GtkWidget *
+ panel_menu_items_create_action_item (PanelActionButtonType action_type)
+ {
+ return panel_menu_items_create_action_item_full (action_type,
+--- gnome-panel/panel-menu-items.h
++++ gnome-panel/panel-menu-items.h
+@@ -91,6 +91,8 @@
+ void panel_menu_item_activate_desktop_file (GtkWidget *menuitem,
+ const char *path);
+
++GtkWidget * panel_menu_items_create_action_item (PanelActionButtonType action_type);
++
+ G_END_DECLS
+
+ #endif /* __PANEL_MENU_ITEMS_H__ */
++++++ gnome-panel-2.12.2.tar.bz2 -> gnome-panel-2.14.2.tar.bz2 ++++++
++++ 205106 lines of diff (skipped)
++++++ gnome-panel-5485-command-history.patch ++++++
--- /var/tmp/diff_new_pack.aqTl6h/_old 2006-08-06 21:52:06.000000000 +0200
+++ /var/tmp/diff_new_pack.aqTl6h/_new 2006-08-06 21:52:06.000000000 +0200
@@ -1,8 +1,8 @@
Index: gnome-panel-2.12.0/gnome-panel/panel-run-dialog.c
================================================================================
---- gnome-panel-2.12.2/gnome-panel/panel-run-dialog.c
-+++ gnome-panel-2.12.2/gnome-panel/panel-run-dialog.c
-@@ -392,7 +392,7 @@
+--- gnome-panel-2.14.2/gnome-panel/panel-run-dialog.c
++++ gnome-panel-2.14.2/gnome-panel/panel-run-dialog.c
+@@ -404,7 +404,7 @@
if (result) {
/* only save working commands in history */
++++++ gnome-panel-alt-f1-slab.patch ++++++
--- /var/tmp/diff_new_pack.aqTl6h/_old 2006-08-06 21:52:06.000000000 +0200
+++ /var/tmp/diff_new_pack.aqTl6h/_new 2006-08-06 21:52:06.000000000 +0200
@@ -1,6 +1,6 @@
---- gnome-panel-2.12.2-orig/gnome-panel/panel-action-protocol.c 2005-01-12 05:16:41.000000000 +0100
-+++ gnome-panel-2.12.2/gnome-panel/panel-action-protocol.c 2006-05-11 15:01:49.000000000 +0200
-@@ -50,6 +50,7 @@ panel_action_protocol_main_menu (GdkScre
+--- gnome-panel-2.14.2/gnome-panel/panel-action-protocol.c
++++ gnome-panel-2.14.2/gnome-panel/panel-action-protocol.c
+@@ -50,6 +50,7 @@
PanelWidget *panel_widget;
GtkWidget *menu;
AppletInfo *info;
@@ -8,7 +8,7 @@
info = panel_applet_get_by_type (PANEL_OBJECT_MENU_BAR, screen);
if (info) {
-@@ -65,6 +66,36 @@ panel_action_protocol_main_menu (GdkScre
+@@ -65,6 +66,36 @@
return;
}
++++++ gnome-panel-beagle-search.patch ++++++
--- /var/tmp/diff_new_pack.aqTl6h/_old 2006-08-06 21:52:06.000000000 +0200
+++ /var/tmp/diff_new_pack.aqTl6h/_new 2006-08-06 21:52:06.000000000 +0200
@@ -1,6 +1,6 @@
--- gnome-panel/panel-action-button.c
+++ gnome-panel/panel-action-button.c
-@@ -188,11 +188,11 @@
+@@ -190,11 +190,11 @@
GnomeDesktopItem *ditem;
GdkScreen *screen;
GError *error = NULL;
@@ -14,35 +14,36 @@
if (file) {
ditem = gnome_desktop_item_new_from_file (file, 0, &error);
-@@ -203,10 +203,10 @@
+@@ -205,11 +205,11 @@
}
if (error) {
panel_error_dialog (screen,
-- "cannot_exec_gnome-search-tool", TRUE,
-+ "cannot_exec_nautilus-search", TRUE,
- _("Cannot execute '%s'"),
- "%s",
-- "gnome-search-tool",
-+ "nautilus x-nautilus-search:",
- error->message);
+- "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);
}
-@@ -216,10 +216,10 @@
+@@ -219,10 +219,10 @@
G_SPAWN_SEARCH_PATH,
NULL, NULL, NULL, &error)) {
- panel_error_dialog (screen,
+ panel_error_dialog (screen,
- "cannot_exec_gnome-search-tool", TRUE,
+ "cannot_exec_nautilus-search", TRUE,
- _("Cannot execute '%s'"),
+ _("Could not execute '%s'"),
"%s",
- "gnome-search-tool",
-+ "nautilus x-nautilus-search:",
++ "nautilus x-nautilus-search",
error->message);
g_error_free (error);
}
--- gnome-panel/panel-menu-items.c
+++ gnome-panel/panel-menu-items.c
-@@ -578,7 +578,7 @@
+@@ -617,7 +617,7 @@
add_menu_separator (places_menu);
panel_menu_items_append_from_desktop (places_menu,
++++++ gnome-panel-bonobo-async.patch ++++++
--- /var/tmp/diff_new_pack.aqTl6h/_old 2006-08-06 21:52:06.000000000 +0200
+++ /var/tmp/diff_new_pack.aqTl6h/_new 2006-08-06 21:52:06.000000000 +0200
@@ -1,11 +1,8 @@
Index: gnome-panel/panel-applet-frame.c
-===================================================================
-RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-applet-frame.c,v
-retrieving revision 1.138.2.1
-diff -u -p -r1.138.2.1 panel-applet-frame.c
---- gnome-panel/panel-applet-frame.c 6 Feb 2006 17:17:08 -0000 1.138.2.1
-+++ gnome-panel/panel-applet-frame.c 21 Feb 2006 14:44:42 -0000
-@@ -101,9 +101,9 @@ static char *panel_applet_frame_construc
+================================================================================
+--- gnome-panel/panel-applet-frame.c
++++ gnome-panel/panel-applet-frame.c
+@@ -101,9 +101,9 @@
const char *iid,
const char *id);
@@ -18,7 +15,7 @@
void
panel_applet_frame_sync_menu_state (PanelAppletFrame *frame)
-@@ -318,7 +318,6 @@ panel_applet_frame_load (const gchar *ii
+@@ -324,7 +324,6 @@
{
PanelAppletFrame *frame;
CORBA_Environment ev;
@@ -26,7 +23,7 @@
PanelAppletFrameActivating *frame_act;
g_return_if_fail (iid != NULL);
-@@ -339,15 +338,11 @@ panel_applet_frame_load (const gchar *ii
+@@ -345,15 +344,11 @@
frame_act->exactpos = exactpos;
frame_act->id = g_strdup (id);
@@ -45,7 +42,7 @@
}
void
-@@ -1178,10 +1173,9 @@ panel_applet_frame_get_size_string (Pane
+@@ -1196,10 +1191,9 @@
}
static char *
@@ -59,7 +56,7 @@
{
char *retval;
char *bg_str;
-@@ -1196,9 +1190,9 @@ panel_applet_frame_construct_moniker (Pa
+@@ -1214,9 +1208,9 @@
locked_down = panel_lockdown_get_locked_down ();
retval = g_strdup_printf (
@@ -71,7 +68,7 @@
panel_applet_frame_get_orient_string (frame, panel),
panel_applet_frame_get_size_string (frame, panel),
locked_down ? "true" : "false");
-@@ -1223,41 +1217,70 @@ panel_applet_frame_event_listener (Bonob
+@@ -1241,41 +1235,70 @@
}
static void
++++++ gnome-panel-clock-positon-truc.diff ++++++
--- /var/tmp/diff_new_pack.aqTl6h/_old 2006-08-06 21:52:06.000000000 +0200
+++ /var/tmp/diff_new_pack.aqTl6h/_new 2006-08-06 21:52:06.000000000 +0200
@@ -1,6 +1,6 @@
--- gnome-panel-2.12.2/applets/clock/clock.c
+++ gnome-panel-2.12.2/applets/clock/clock.c
-@@ -301,40 +301,83 @@
+@@ -301,40 +301,74 @@
/* Show date in another line if panel is vertical, or
* horizontal but large enough to hold two lines of text
*/
@@ -20,15 +20,13 @@
- else
- time_format = cd->showseconds ? _("%H:%M:%S") : _("%H:%M");
+ if (USE_MUL_LINE_FORMAT (cd)){
-+ if (cd->size >= 65){
-+ font_factor = 7;
-+ if (cd->format == CLOCK_FORMAT_12)
+ /* translators: reverse the order of these arguments
+ * if the time should come before the
+ * date on a clock in your locale.
-+ * You can use %l in 24 hour locales,
-+ * there is a switch in preferences.
+ */
++ if (cd->size >= 65){
++ font_factor = 7;
++ if (cd->format == CLOCK_FORMAT_12)
+ time_format = cd->showseconds ? _("%l:%M:%S %p") : _("%l:%M %p");
+ else
+ time_format = cd->showseconds ? _("%H:%M:%S") : _("%H:%M");
@@ -38,15 +36,8 @@
+ if (cd->size >= 40) font_factor = 7;
+ else font_factor = 6;
+ if (cd->format == CLOCK_FORMAT_12)
-+ /* translators: use %l even in 24 hour locales,
-+ * there is a switch in preferences.
-+ */
+ time_format = cd->showseconds ? _("%l:%M\n%S %p") : _("%l:%M\n%p");
+ else
-+ /* translators: reverse the order of these arguments
-+ * if the time should come before the
-+ * date on a clock in your locale.
-+ */
+ time_format = cd->showseconds ? _("%H:%M\n%S") : _("%H:%M");
+ date_format = _("%a\n%b %e");
+ }
@@ -112,7 +103,7 @@
}
g_free (cd->timeformat);
-@@ -344,6 +387,8 @@
+@@ -344,6 +378,8 @@
cd->timeformat = g_strdup ("???");
g_free (clock_format);
++++++ gnome-panel-disable-movement.patch ++++++
--- /var/tmp/diff_new_pack.aqTl6h/_old 2006-08-06 21:52:06.000000000 +0200
+++ /var/tmp/diff_new_pack.aqTl6h/_new 2006-08-06 21:52:06.000000000 +0200
@@ -53,8 +53,8 @@
setup_menuitem (menuitem,
GTK_ICON_SIZE_MENU,
gtk_image_new_from_stock (GTK_STOCK_NEW,
---- gnome-panel/panel-default-setup.entries.in
-+++ gnome-panel/panel-default-setup.entries.in
+--- gnome-panel/panel-default-setup.entries
++++ gnome-panel/panel-default-setup.entries
@@ -96,6 +96,13 @@
</value>
</entry>
++++++ gnome-panel-in-proc-applets.patch ++++++
--- /var/tmp/diff_new_pack.aqTl6h/_old 2006-08-06 21:52:06.000000000 +0200
+++ /var/tmp/diff_new_pack.aqTl6h/_new 2006-08-06 21:52:06.000000000 +0200
@@ -38,7 +38,7 @@
ui_DATA = GNOME_ClockApplet.xml
--- applets/clock/clock.c
+++ applets/clock/clock.c
-@@ -2309,7 +2309,6 @@
+@@ -2329,7 +2329,6 @@
gtk_container_set_border_width (GTK_CONTAINER (cd->toggle), 0);
gtk_container_add (GTK_CONTAINER (cd->applet), cd->toggle);
@@ -46,7 +46,7 @@
gtk_widget_show (cd->applet);
/* FIXME: Update this comment. */
-@@ -2791,9 +2790,8 @@
+@@ -2812,9 +2811,8 @@
return retval;
}
@@ -98,7 +98,7 @@
--- applets/fish/fish.c
+++ applets/fish/fish.c
-@@ -1842,7 +1842,6 @@
+@@ -1880,7 +1880,6 @@
NULL);
}
@@ -106,7 +106,7 @@
setup_fish_widget (fish);
return TRUE;
-@@ -2026,9 +2025,8 @@
+@@ -2066,9 +2065,8 @@
return type;
}
@@ -168,7 +168,7 @@
--- applets/notification_area/main.c
+++ applets/notification_area/main.c
-@@ -384,7 +384,6 @@
+@@ -349,7 +349,6 @@
gtk_container_add (GTK_CONTAINER (tray->applet), tray->frame);
@@ -176,7 +176,7 @@
gtk_widget_show_all (GTK_WIDGET (tray->applet));
panel_applet_setup_menu_from_file (PANEL_APPLET (applet),
-@@ -397,18 +396,8 @@
+@@ -362,18 +361,8 @@
return TRUE;
}
@@ -248,7 +248,7 @@
--- applets/wncklet/wncklet.c
+++ applets/wncklet/wncklet.c
-@@ -222,9 +222,8 @@
+@@ -202,9 +202,8 @@
}
++++++ gnome-panel-layout.patch ++++++
--- /var/tmp/diff_new_pack.aqTl6h/_old 2006-08-06 21:52:06.000000000 +0200
+++ /var/tmp/diff_new_pack.aqTl6h/_new 2006-08-06 21:52:06.000000000 +0200
@@ -1,5 +1,7 @@
---- gnome-panel-2.12.2/gnome-panel/panel-default-setup.entries.in
-+++ gnome-panel-2.12.2/gnome-panel/panel-default-setup.entries.in
+Index: gnome-panel-2.12.0/gnome-panel/panel-default-setup.entries
+================================================================================
+--- gnome-panel-2.14.2/gnome-panel/panel-default-setup.entries
++++ gnome-panel-2.14.2/gnome-panel/panel-default-setup.entries
@@ -9,9 +9,11 @@
/schemas/apps/panel/general/toplevel_id_list
<value>
@@ -12,10 +14,13 @@
<value>
<string>bottom_panel</string>
</value>
-@@ -29,12 +31,17 @@
- <value>
- <string>menu_bar</string>
- </value>
+@@ -26,15 +28,17 @@
+ /schemas/apps/panel/general/object_id_list
+ <value>
+ <list type="string">
+- <value>
+- <string>menu_bar</string>
+- </value>
+
Reply