Accepting request 33204 from home:vuntz:branches:GNOME:Factory

Copy from home:vuntz:branches:GNOME:Factory/gnome-shell via accept of submit request 33204 revision 2.
Request was accepted with message:
ok

OBS-URL: https://build.opensuse.org/request/show/33204
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=24
This commit is contained in:
Vincent Untz 2010-02-23 14:44:26 +00:00 committed by Git OBS Bridge
parent 83d3f11b83
commit 96021ce0bc
6 changed files with 123 additions and 181 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:64d30bd2692af2047a3056545b8f549c713ee91877cee8742d4b02d606ef6bd4
size 591376

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7429cd9689e1a2e302b1c23e06c576ee6b0542a7f1c72c4c0efce3d83842aa58
size 660830

View File

@ -1,173 +0,0 @@
commit ab0460ad5926aef2cb802f201069109ce9fc2dd8
Author: Colin Walters <walters@verbum.org>
Date: Thu Oct 8 14:53:46 2009 -0400
Use clutter_actor_destroy in dispose, add _dispose where needed
ClutterGroup calls _destroy, but most of St was just calling _unparent.
This caused problems because the DESTROY signal was not emitted
for child elements after destroying a toplevel. Also, in a GC'd
binding it would cause unpredictable lifetime of children.
Some St widgets simply didn't have _dispose at all; implement it.
Note because of the usage of the background_image in StButton,
we can't cleanly destroy it inside the StWidget.
https://bugzilla.gnome.org/show_bug.cgi?id=597845
diff --git a/src/st/st-bin.c b/src/st/st-bin.c
index ed00e63..4c862b6 100644
--- a/src/st/st-bin.c
+++ b/src/st/st-bin.c
@@ -352,10 +352,8 @@ st_bin_dispose (GObject *gobject)
StBinPrivate *priv = ST_BIN (gobject)->priv;
if (priv->child)
- {
- clutter_actor_unparent (priv->child);
- priv->child = NULL;
- }
+ clutter_actor_destroy (priv->child);
+ g_assert (priv->child == NULL);
G_OBJECT_CLASS (st_bin_parent_class)->dispose (gobject);
}
diff --git a/src/st/st-box-layout.c b/src/st/st-box-layout.c
index b87b072..e81f64c 100644
--- a/src/st/st-box-layout.c
+++ b/src/st/st-box-layout.c
@@ -403,11 +403,7 @@ st_box_layout_dispose (GObject *object)
StBoxLayoutPrivate *priv = ST_BOX_LAYOUT (object)->priv;
while (priv->children)
- {
- clutter_actor_unparent (CLUTTER_ACTOR (priv->children->data));
-
- priv->children = g_list_delete_link (priv->children, priv->children);
- }
+ clutter_actor_destroy (priv->children->data);
if (priv->hadjustment)
{
diff --git a/src/st/st-entry.c b/src/st/st-entry.c
index 450f4cc..ac79f4e 100644
--- a/src/st/st-entry.c
+++ b/src/st/st-entry.c
@@ -162,7 +162,7 @@ st_entry_dispose (GObject *object)
if (priv->entry)
{
- clutter_actor_unparent (priv->entry);
+ clutter_actor_destroy (priv->entry);
priv->entry = NULL;
}
}
diff --git a/src/st/st-label.c b/src/st/st-label.c
index 88fa868..db9b0c1 100644
--- a/src/st/st-label.c
+++ b/src/st/st-label.c
@@ -184,6 +184,20 @@ st_label_allocate (ClutterActor *actor,
}
static void
+st_label_dispose (GObject *actor)
+{
+ StLabelPrivate *priv = ST_LABEL (actor)->priv;
+
+ if (priv->label)
+ {
+ clutter_actor_destroy (priv->label);
+ priv->label = NULL;
+ }
+
+ G_OBJECT_CLASS (st_label_parent_class)->dispose (G_OBJECT (actor));
+}
+
+static void
st_label_paint (ClutterActor *actor)
{
StLabelPrivate *priv = ST_LABEL (actor)->priv;
@@ -227,6 +241,7 @@ st_label_class_init (StLabelClass *klass)
gobject_class->set_property = st_label_set_property;
gobject_class->get_property = st_label_get_property;
+ gobject_class->dispose = st_label_dispose;
actor_class->paint = st_label_paint;
actor_class->allocate = st_label_allocate;
diff --git a/src/st/st-scroll-view.c b/src/st/st-scroll-view.c
index 2dd6f6e..cb555eb 100644
--- a/src/st/st-scroll-view.c
+++ b/src/st/st-scroll-view.c
@@ -129,13 +129,13 @@ st_scroll_view_dispose (GObject *object)
if (priv->vscroll)
{
- clutter_actor_unparent (priv->vscroll);
+ clutter_actor_destroy (priv->vscroll);
priv->vscroll = NULL;
}
if (priv->hscroll)
{
- clutter_actor_unparent (priv->hscroll);
+ clutter_actor_destroy (priv->hscroll);
priv->hscroll = NULL;
}
diff --git a/src/st/st-table.c b/src/st/st-table.c
index 9ef2cf1..e844ff6 100644
--- a/src/st/st-table.c
+++ b/src/st/st-table.c
@@ -271,15 +271,9 @@ static void
st_table_dispose (GObject *gobject)
{
StTablePrivate *priv = ST_TABLE (gobject)->priv;
- GSList *l, *next;
- for (l = priv->children; l;)
- {
- next = l->next;
- clutter_container_remove_actor ((ClutterContainer *) gobject,
- CLUTTER_ACTOR (l->data));
- l = next;
- }
+ while (priv->children)
+ clutter_actor_destroy (priv->children->data);
G_OBJECT_CLASS (st_table_parent_class)->dispose (gobject);
}
diff --git a/src/st/st-tooltip.c b/src/st/st-tooltip.c
index 9ed299e..5232dbc 100644
--- a/src/st/st-tooltip.c
+++ b/src/st/st-tooltip.c
@@ -356,6 +356,20 @@ st_tooltip_unmap (ClutterActor *self)
}
static void
+st_tooltip_dispose (GObject *self)
+{
+ StTooltipPrivate *priv = ST_TOOLTIP (self)->priv;
+
+ if (priv->label)
+ {
+ clutter_actor_destroy (priv->label);
+ priv->label = NULL;
+ }
+
+ G_OBJECT_CLASS (st_tooltip_parent_class)->dispose (self);
+}
+
+static void
st_tooltip_class_init (StTooltipClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
@@ -367,6 +381,7 @@ st_tooltip_class_init (StTooltipClass *klass)
gobject_class->set_property = st_tooltip_set_property;
gobject_class->get_property = st_tooltip_get_property;
+ gobject_class->dispose = st_tooltip_dispose;
actor_class->get_preferred_width = st_tooltip_get_preferred_width;
actor_class->get_preferred_height = st_tooltip_get_preferred_height;

View File

@ -0,0 +1,26 @@
From 105698c431f6a5ef2d8fac29036dad88dffefa48 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@gnome.org>
Date: Tue, 23 Feb 2010 10:22:44 +0100
Subject: [PATCH] Fix installation of translations
They were installed as @GETTEXT_PACKAGE@.mo because GETTEXT_PACKAGE was
not substituted.
---
configure.ac | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/configure.ac b/configure.ac
index 094a136..88d3a76 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,6 +24,7 @@ GETTEXT_PACKAGE=gnome-shell
IT_PROG_INTLTOOL(0.26)
AM_GLIB_GNU_GETTEXT
AC_DEFINE([GETTEXT_PACKAGE], [PACKAGE_TARNAME], [The prefix for our gettext translation domain])
+AC_SUBST(GETTEXT_PACKAGE)
PKG_PROG_PKG_CONFIG([0.22])
--
1.6.6.1

View File

@ -1,3 +1,90 @@
-------------------------------------------------------------------
Tue Feb 23 09:18:33 CET 2010 - vuntz@opensuse.org
- Update to version 2.29.0:
+ For a full list of changes, see
http://mail.gnome.org/archives/gnome-shell-list/2010-February/msg00058.html
+ New message tray showing notifications sliding into the bottom
of the screen. Includes a status area for past notifications,
and also pulls in "urgent window" handled in GNOME 2 by
flashing the taskbar.
+ Add the ability to set your presence to the user status menu
+ Allow switching the overview between a grid and linear view of
workspaces
+ Redo the application browser to use a grid of icons
+ Initial version of the extension system
+ Initial support for RTL layout in ST and the shell
+ Add undo capability to overview, e.g., when removing favorites
+ New workspace switcher popup
+ Work on visual appearance to match mockups
+ Port most of existing code to CSS
+ Other visual improvements
- Show a scaled-up excerpt from the application item in the
panel
- Minimize windows to 'Activities' button
- Fade out desktop icons when showing overview
- Use a fixed ordering for well-known icons in the system tray
- Nicer animation of hidden windows when transitioning to/from
the overview
- Draw a ripple when the hot corner is hit
+ App switcher (Alt-Tab) improvements
- Many behavior and visual refinements based on design feedback
- Show a separator between windows on this and other workspaces
- Position on the currently focused monitor
- Bug fixes
+ Miscellaneous behavioral improvements
- Allow workspace switching by mousewheel on indicators in
overview
- Allow dropping on workspace indicators
- Enable DND of search results
- When closing a window from the overview that puts up a
confirm dialog, switch to that dialog
- When the sidebar is collapsed, auto-hide it
- Show "No matching results" when search matches nothing
- Limit user to 16 workspaces
- Allow clicking on any part of section headers in the dash for
browsing
- Match on executable names as well when searching
- For clock AM/PM vs. 24-hour based on the locale
+ ST (Shell Toolkit) improvements
- CSS addtions:
. width/height
. max-width/max-height
. -st-shadow
. gradients
. radial gradients
. Non-uniform border widths (when no corner radius)
. text-decoration: [underline|strikethrough]
- Make allocation behavior consistent across actors
- Support fixed-position children in StBoxLayout
- Support raising and lowering children in StBoxLayout
- Add st_box_layout_move_child and st_box_layout_insert_actor
- Add st_box_layout_remove_all, st_box_layout_destroy_children,
st_box_layout_get_n_children
- Add StClickable, StOverflowBox actors
- Support setting scrollbar policy on StScrollView
- Support shadows on edges of StScrollView to hint at more
content
+ Make places results available in search
+ Handle changes to the current resolution
+ Bug fixes for multihead support
+ Make screen shell recorder work again
+ More miscellaneous improvements
- Add gnome-shell --eval-file=<file> to eval file in running
shell via D-BUS
- Add eject buttons to places section
- Add completion to the Alt-F2 run dialog
- Make screen recording parameters configurable
- Add an initial version of a manpage
+ Performance improvements
+ Code cleanups
+ Bug fixes
+ Build fixes
+ Updated translations.
- Drop gnome-shell-leak.patch: fixed upstream.
- Add gnome-shell-translations.patch to fix installation of
translations, and call autoreconf -fi for this patch.
-------------------------------------------------------------------
Thu Jan 28 12:43:43 CET 2010 - vuntz@opensuse.org

View File

@ -1,5 +1,5 @@
#
# spec file for package gnome-shell (Version 2.28.0)
# spec file for package gnome-shell (Version 2.29.0)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -36,16 +36,16 @@ BuildRequires: update-desktop-files
BuildRequires: xorg-x11-devel
License: GPLv2+
Group: System/GUI/GNOME
Version: 2.28.0
Release: 3
Version: 2.29.0
Release: 1
Summary: GNOME Shell
Source: %{name}-%{version}.tar.bz2
# To integrate a preview mode in GDM.
# Note: this also explains the Requires on gnome-session below.
Source1: gnome-shell-session
Source2: gnome3.desktop
# PATCH-FIX-UPSTREAM gnome-shell-leak.patch vuntz@opensuse.org -- Fix from upstream
Patch0: gnome-shell-leak.patch
# PATCH-FIX-UPSTREAM gnome-shell-translations.patch bgo610787 vuntz@opensuse.org -- Correctly install .mo files
Patch0: gnome-shell-translations.patch
# PATCH-FIX-OPENSUSE gnome-shell-libmozjs.patch vuntz@novell.com -- LD_LIBRARY_PATH neeeds to be set on 11.1
Patch99: gnome-shell-libmozjs.patch
Requires: %{name}-lang = %{version}
@ -69,6 +69,7 @@ documents, and organizing open windows in GNOME.
%endif
%build
autoreconf -fi
%if %suse_version <= 1110
# ugly workaround for a build failure on 11.1. The same workaround seems to be needed on Ubuntu.
export LD_LIBRARY_PATH=%{_libdir}/xulrunner-1.9
@ -114,6 +115,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/applications/*.desktop
%{_datadir}/gnome-shell/
%{_datadir}/xsessions/*.desktop
%doc %{_mandir}/man?/*.*
%files lang -f %{name}.lang