r22972 - in /packages/unstable/libslab/debian: changelog patches/libslab-bnc187879-fix-crash.patch patches/libslab-bnc536778-fix-libslab-split.patch patches/libslab-bnc537483-fix-redraw.patch patches/series

jak at users.alioth.debian.org jak at users.alioth.debian.org
Fri Feb 5 20:02:22 UTC 2010 

Author: jak
Date: Fri Feb  5 20:01:56 2010
New Revision: 22972

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22972
Log:
* Merge patches from openSUSE / Novell
  - libslab-bnc187879-fix-crash.patch: Fixes a crash
    See https://bugzilla.novell.com/show_bug.cgi?id=187879
  - libslab-bnc536778-fix-libslab-split.patch: Fixes parts of gnome-main-menu
    which were empty because libslab looked in the wrong location.
    See https://bugzilla.novell.com/show_bug.cgi?id=536778
  - libslab-bnc537483-fix-redraw.patch:
    See https://bugzilla.novell.com/show_bug.cgi?id=537483

Added:
    packages/unstable/libslab/debian/patches/libslab-bnc187879-fix-crash.patch
    packages/unstable/libslab/debian/patches/libslab-bnc536778-fix-libslab-split.patch
    packages/unstable/libslab/debian/patches/libslab-bnc537483-fix-redraw.patch
Modified:
    packages/unstable/libslab/debian/changelog
    packages/unstable/libslab/debian/patches/series

Modified: packages/unstable/libslab/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libslab/debian/changelog?rev=22972&op=diff
==============================================================================
--- packages/unstable/libslab/debian/changelog [utf-8] (original)
+++ packages/unstable/libslab/debian/changelog [utf-8] Fri Feb  5 20:01:56 2010
@@ -1,3 +1,16 @@
+libslab (2.27.91-2) UNRELEASED; urgency=low
+
+  * Merge patches from openSUSE / Novell
+    - libslab-bnc187879-fix-crash.patch: Fixes a crash
+      See https://bugzilla.novell.com/show_bug.cgi?id=187879
+    - libslab-bnc536778-fix-libslab-split.patch: Fixes parts of gnome-main-menu
+      which were empty because libslab looked in the wrong location.
+      See https://bugzilla.novell.com/show_bug.cgi?id=536778
+    - libslab-bnc537483-fix-redraw.patch:
+      See https://bugzilla.novell.com/show_bug.cgi?id=537483
+
+ -- Julian Andres Klode <jak at debian.org>  Sat, 10 Oct 2009 16:13:38 +0200
+
 libslab (2.27.91-1) unstable; urgency=low
 
   * Initial upload (Closes: #547434).

Added: packages/unstable/libslab/debian/patches/libslab-bnc187879-fix-crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libslab/debian/patches/libslab-bnc187879-fix-crash.patch?rev=22972&op=file
==============================================================================
--- packages/unstable/libslab/debian/patches/libslab-bnc187879-fix-crash.patch (added)
+++ packages/unstable/libslab/debian/patches/libslab-bnc187879-fix-crash.patch [utf-8] Fri Feb  5 20:01:56 2010
@@ -1,0 +1,23 @@
+Bug-Novell: https://bugzilla.novell.com/show_bug.cgi?id=187879
+diff -Npur libslab-old/libslab/document-tile.c libslab-new/libslab/document-tile.c
+--- libslab-old/libslab/document-tile.c	2009-09-14 17:25:24.086820607 +0800
++++ libslab-new/libslab/document-tile.c	2009-09-14 17:23:45.117852741 +0800
+@@ -1053,7 +1053,7 @@ user_docs_trigger (Tile *tile, TileEvent
+ 
+ 
+ 	if (priv->is_bookmarked)
+-		bookmark_agent_remove_item (priv->agent, tile->uri);
++                bookmark_agent_remove_item (bookmark_agent_get_instance (BOOKMARK_STORE_USER_DOCS), tile->uri);
+ 	else {
+ 		item = g_new0 (BookmarkItem, 1);
+ 		item->uri       = tile->uri;
+@@ -1064,7 +1064,7 @@ user_docs_trigger (Tile *tile, TileEvent
+ 			item->app_exec  = (gchar *) g_app_info_get_executable (priv->default_app);
+ 		}
+ 
+-		bookmark_agent_add_item (priv->agent, item);
++                bookmark_agent_add_item (bookmark_agent_get_instance (BOOKMARK_STORE_USER_DOCS), item);
+ 		g_free (item);
+ 	}
+ 
+

Added: packages/unstable/libslab/debian/patches/libslab-bnc536778-fix-libslab-split.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libslab/debian/patches/libslab-bnc536778-fix-libslab-split.patch?rev=22972&op=file
==============================================================================
--- packages/unstable/libslab/debian/patches/libslab-bnc536778-fix-libslab-split.patch (added)
+++ packages/unstable/libslab/debian/patches/libslab-bnc536778-fix-libslab-split.patch [utf-8] Fri Feb  5 20:01:56 2010
@@ -1,0 +1,33 @@
+Bug-Novell: https://bugzilla.novell.com/show_bug.cgi?id=536778
+diff --git a/libslab/bookmark-agent.c b/libslab/bookmark-agent.c
+index bdd418a..52322de 100644
+--- a/libslab/bookmark-agent.c
++++ b/libslab/bookmark-agent.c
+@@ -26,6 +26,8 @@
+ #	define PACKAGE "gnome-main-menu"
+ #endif
+ 
++#define MAIN_MENU "gnome-main-menu"
++
+ #include <gtk/gtk.h>
+ 
+ #include <string.h>
+@@ -531,7 +533,7 @@ bookmark_agent_new (BookmarkStoreType type)
+ 		priv->user_modifiable = GPOINTER_TO_INT (libslab_get_gconf_value (priv->lockdown_key));
+ 
+ 		priv->user_store_path = g_build_filename (
+-			g_get_user_data_dir (), PACKAGE, priv->store_filename, NULL);
++			g_get_user_data_dir (), MAIN_MENU, priv->store_filename, NULL);
+ 
+ 		priv->update_path = update_user_spec_path;
+ 
+@@ -928,7 +930,7 @@ find_package_data_file (const gchar *filename)
+ 	dirs = g_get_system_data_dirs ();
+ 	
+ 	for (i = 0; ! path && dirs && dirs [i]; ++i) {
+-		path = g_build_filename (dirs [i], PACKAGE, filename, NULL);
++		path = g_build_filename (dirs [i], MAIN_MENU, filename, NULL);
+ 		
+ 		if (! g_file_test (path, G_FILE_TEST_EXISTS)) {
+ 			g_free (path);
+

Added: packages/unstable/libslab/debian/patches/libslab-bnc537483-fix-redraw.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libslab/debian/patches/libslab-bnc537483-fix-redraw.patch?rev=22972&op=file
==============================================================================
--- packages/unstable/libslab/debian/patches/libslab-bnc537483-fix-redraw.patch (added)
+++ packages/unstable/libslab/debian/patches/libslab-bnc537483-fix-redraw.patch [utf-8] Fri Feb  5 20:01:56 2010
@@ -1,0 +1,23 @@
+Bug-Novell: https://bugzilla.novell.com/show_bug.cgi?id=537483
+diff --git a/libslab/tile.c b/libslab/tile.c
+index 870944d..3d7cd16 100644
+--- a/libslab/tile.c
++++ b/libslab/tile.c
+@@ -321,6 +321,7 @@ tile_clicked (GtkButton * widget)
+ 
+ 	gtk_button_released (widget);
+ 	g_free (tile_event);
++        gtk_button_leave (widget);
+ }
+ 
+ static gboolean
+@@ -353,6 +354,9 @@ tile_expose (GtkWidget * widget, GdkEventExpose * event)
+ 	if ((has_focus = GTK_WIDGET_HAS_FOCUS (widget)))
+ 		GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
+ 
++        if (TILE (widget)->entered == FALSE)
++                gtk_widget_set_state (widget, GTK_STATE_NORMAL);
++
+ 	retval = (*GTK_WIDGET_CLASS (tile_parent_class)->expose_event) (widget, event);
+ 
+ 	if (has_focus)

Modified: packages/unstable/libslab/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libslab/debian/patches/series?rev=22972&op=diff
==============================================================================
--- packages/unstable/libslab/debian/patches/series [utf-8] (original)
+++ packages/unstable/libslab/debian/patches/series [utf-8] Fri Feb  5 20:01:56 2010
@@ -1,1 +1,4 @@
+libslab-bnc187879-fix-crash.patch
+libslab-bnc536778-fix-libslab-split.patch
+libslab-bnc537483-fix-redraw.patch
 ltmain-as-needed.diff

More information about the pkg-gnome-commits mailing list