[Pkg-galago-commit] r436 - in packages/unstable/slab/debian: .
patches
Clément Stenac
zorglub at alioth.debian.org
Sat Oct 28 18:48:50 CEST 2006
Author: zorglub
Date: 2006-10-28 18:48:50 +0200 (Sat, 28 Oct 2006)
New Revision: 436
Modified:
packages/unstable/slab/debian/changelog
packages/unstable/slab/debian/patches/01_fix_menu_path.patch
packages/unstable/slab/debian/patches/03_fix_upgrade_packages.patch
packages/unstable/slab/debian/patches/04_link_statically.patch
packages/unstable/slab/debian/patches/08_add_place_menu.patch
packages/unstable/slab/debian/patches/10_default_commands.patch
packages/unstable/slab/debian/patches/11_fix_control_center.patch
Log:
* New upstream release
* Refresh broken patches
Modified: packages/unstable/slab/debian/changelog
===================================================================
--- packages/unstable/slab/debian/changelog 2006-10-13 16:38:05 UTC (rev 435)
+++ packages/unstable/slab/debian/changelog 2006-10-28 16:48:50 UTC (rev 436)
@@ -1,3 +1,9 @@
+slab (0.0.cvs.20061028-1) unstable; urgency=low
+
+ * New upstream snapshot
+
+ -- Clément Stenac <zorglub at videolan.org> Sat, 28 Oct 2006 14:39:59 +0200
+
slab (0.0.cvs.20060915-1) unstable; urgency=low
* New upstream release
Modified: packages/unstable/slab/debian/patches/01_fix_menu_path.patch
===================================================================
--- packages/unstable/slab/debian/patches/01_fix_menu_path.patch 2006-10-13 16:38:05 UTC (rev 435)
+++ packages/unstable/slab/debian/patches/01_fix_menu_path.patch 2006-10-28 16:48:50 UTC (rev 436)
@@ -1,11 +1,13 @@
---- slab-0.0.cvs.20060915/application-browser/src/application-browser.orig.c 2006-09-18 21:26:53.000000000 +0200
-+++ slab-0.0.cvs.20060915/application-browser/src/application-browser.c 2006-09-18 21:27:32.000000000 +0200
-@@ -83,7 +83,7 @@
+Index: slab/application-browser/src/application-browser.c
+===================================================================
+--- slab.orig/application-browser/src/application-browser.c 2006-06-26 16:11:48.000000000 +0200
++++ slab/application-browser/src/application-browser.c 2006-10-28 16:07:40.000000000 +0200
+@@ -104,7 +104,7 @@
config->max_items = get_slab_gconf_int (NEW_APPS_MAX_ITEMS);
config->name = _("New Applications");
AppShellData *app_data =
-- appshelldata_new ("applications.menu", config, APPLICATION_BROWSER_PREFIX,
-+ appshelldata_new ("gnome-applications.menu", config, APPLICATION_BROWSER_PREFIX,
- GTK_ICON_SIZE_DND);
+- appshelldata_new ("applications.menu", config,
++ appshelldata_new ("gnome-applications.menu", config,
+ APPLICATION_BROWSER_PREFIX,
+ GTK_ICON_SIZE_DND);
generate_categories (app_data);
-
Modified: packages/unstable/slab/debian/patches/03_fix_upgrade_packages.patch
===================================================================
--- packages/unstable/slab/debian/patches/03_fix_upgrade_packages.patch 2006-10-13 16:38:05 UTC (rev 435)
+++ packages/unstable/slab/debian/patches/03_fix_upgrade_packages.patch 2006-10-28 16:48:50 UTC (rev 436)
@@ -1,7 +1,8 @@
-diff -urNad slab-0.0.cvs.20060915.orig/main-menu/etc/slab.schemas.in.in slab-0.0.cvs.20060915/main-menu/etc/slab.schemas.in.in
---- slab-0.0.cvs.20060915.orig/main-menu/etc/slab.schemas.in.in 2006-08-23 14:00:54.000000000 +0200
-+++ slab-0.0.cvs.20060915/main-menu/etc/slab.schemas.in.in 2006-08-24 15:54:52.000000000 +0200
-@@ -79,7 +93,7 @@
+Index: slab/main-menu/etc/slab.schemas.in.in
+===================================================================
+--- slab.orig/main-menu/etc/slab.schemas.in.in 2006-06-26 16:13:03.000000000 +0200
++++ slab/main-menu/etc/slab.schemas.in.in 2006-10-28 16:08:29.000000000 +0200
+@@ -79,7 +79,7 @@
<applyto>/desktop/gnome/applications/main-menu/system-area/package_manager_item</applyto>
<owner>gnome-main-menu</owner>
<type>string</type>
@@ -10,31 +11,30 @@
<locale name="C">
<short>package manager item .desktop file</short>
<long>package manager item .desktop file</long>
-
---- slab-0.0.cvs.20060915/libtile/application-tile.c.orig 2006-09-18 21:38:11.000000000 +0200
-+++ slab-0.0.cvs.20060915/libtile/application-tile.c 2006-09-18 21:38:47.000000000 +0200
-@@ -386,8 +386,8 @@
-
+Index: slab/libtile/application-tile.c
+===================================================================
+--- slab.orig/libtile/application-tile.c 2006-06-26 16:11:53.000000000 +0200
++++ slab/libtile/application-tile.c 2006-10-28 16:09:04.000000000 +0200
+@@ -417,7 +417,7 @@
gtk_container_add (GTK_CONTAINER (context_menu), menu_item);
}
--
-- /* make upgrade action */
-+/*
-+ make upgrade action
- if (verify_package_management_command (SLAB_UPGRADE_PACKAGE_KEY))
- {
-@@ -397,7 +397,7 @@
- gtk_container_add (menu_ctnr, menu_item);
- }
+-/* make upgrade action */
++/* make upgrade action
-- /* make uninstall action */
-+ make uninstall action
+ action = tile_action_new (TILE (this), upgrade_trigger, _("Upgrade"),
+ 0);
+@@ -425,7 +425,7 @@
+ menu_item = GTK_WIDGET (tile_action_get_menu_item (action));
+ gtk_container_add (menu_ctnr, menu_item);
- if (verify_package_management_command (SLAB_UNINSTALL_PACKAGE_KEY))
- {
-@@ -419,7 +419,7 @@
+-/* make uninstall action */
++ make uninstall action
+ action = tile_action_new (TILE (this), uninstall_trigger,
+ _("Uninstall"), 0);
+@@ -445,7 +445,7 @@
+
g_error_free (error);
}
-
Modified: packages/unstable/slab/debian/patches/04_link_statically.patch
===================================================================
--- packages/unstable/slab/debian/patches/04_link_statically.patch 2006-10-13 16:38:05 UTC (rev 435)
+++ packages/unstable/slab/debian/patches/04_link_statically.patch 2006-10-28 16:48:50 UTC (rev 436)
@@ -1,8 +1,8 @@
-Index: slab-0.0.cvs.20060915/application-browser/src/Makefile.am
+Index: slab/application-browser/src/Makefile.am
===================================================================
---- slab-0.0.cvs.20060915.orig/application-browser/src/Makefile.am 2006-09-18 21:43:44.000000000 +0200
-+++ slab-0.0.cvs.20060915/application-browser/src/Makefile.am 2006-09-18 21:43:50.000000000 +0200
-@@ -12,9 +12,9 @@
+--- slab.orig/application-browser/src/Makefile.am 2006-06-26 16:11:48.000000000 +0200
++++ slab/application-browser/src/Makefile.am 2006-10-28 16:09:09.000000000 +0200
+@@ -16,9 +16,9 @@
application_browser_LDADD = \
$(APPLICATION_BROWSER_LIBS) \
@@ -15,10 +15,10 @@
AM_CPPFLAGS = \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
-Index: slab-0.0.cvs.20060915/control-center/src/Makefile.am
+Index: slab/control-center/src/Makefile.am
===================================================================
---- slab-0.0.cvs.20060915.orig/control-center/src/Makefile.am 2006-09-18 21:43:44.000000000 +0200
-+++ slab-0.0.cvs.20060915/control-center/src/Makefile.am 2006-09-18 21:43:50.000000000 +0200
+--- slab.orig/control-center/src/Makefile.am 2006-06-26 16:11:50.000000000 +0200
++++ slab/control-center/src/Makefile.am 2006-10-28 16:09:09.000000000 +0200
@@ -12,9 +12,9 @@
control_center_LDADD = \
@@ -32,10 +32,10 @@
AM_CPPFLAGS = \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
-Index: slab-0.0.cvs.20060915/main-menu/src/Makefile.am
+Index: slab/main-menu/src/Makefile.am
===================================================================
---- slab-0.0.cvs.20060915.orig/main-menu/src/Makefile.am 2006-09-18 21:43:44.000000000 +0200
-+++ slab-0.0.cvs.20060915/main-menu/src/Makefile.am 2006-09-18 21:43:50.000000000 +0200
+--- slab.orig/main-menu/src/Makefile.am 2006-06-26 16:13:03.000000000 +0200
++++ slab/main-menu/src/Makefile.am 2006-10-28 16:09:09.000000000 +0200
@@ -33,6 +33,6 @@
main_menu_LDADD = \
$(MAIN_MENU_LIBS) \
@@ -46,11 +46,11 @@
+ $(top_builddir)/utils/.libs/libutils.a \
+ $(top_builddir)/libslab/.libs/libslab.a \
+ $(top_builddir)/libtile/.libs/libtile.a
-Index: slab-0.0.cvs.20060915/application-browser/src/Makefile.in
+Index: slab/application-browser/src/Makefile.in
===================================================================
---- slab-0.0.cvs.20060915.orig/application-browser/src/Makefile.in 2006-09-18 21:43:44.000000000 +0200
-+++ slab-0.0.cvs.20060915/application-browser/src/Makefile.in 2006-09-18 21:43:50.000000000 +0200
-@@ -53,9 +53,9 @@
+--- slab.orig/application-browser/src/Makefile.in 2006-10-28 14:23:49.000000000 +0200
++++ slab/application-browser/src/Makefile.in 2006-10-28 16:09:09.000000000 +0200
+@@ -54,9 +54,9 @@
application_browser_OBJECTS = $(am_application_browser_OBJECTS)
am__DEPENDENCIES_1 =
application_browser_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@@ -63,7 +63,7 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
-@@ -263,9 +263,9 @@
+@@ -268,9 +268,9 @@
application_browser_LDADD = \
$(APPLICATION_BROWSER_LIBS) \
@@ -76,10 +76,10 @@
AM_CPPFLAGS = \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
-Index: slab-0.0.cvs.20060915/control-center/src/Makefile.in
+Index: slab/control-center/src/Makefile.in
===================================================================
---- slab-0.0.cvs.20060915.orig/control-center/src/Makefile.in 2006-09-18 21:43:44.000000000 +0200
-+++ slab-0.0.cvs.20060915/control-center/src/Makefile.in 2006-09-18 21:43:50.000000000 +0200
+--- slab.orig/control-center/src/Makefile.in 2006-10-28 14:23:49.000000000 +0200
++++ slab/control-center/src/Makefile.in 2006-10-28 16:09:09.000000000 +0200
@@ -53,9 +53,9 @@
control_center_OBJECTS = $(am_control_center_OBJECTS)
am__DEPENDENCIES_1 =
@@ -106,10 +106,10 @@
AM_CPPFLAGS = \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
-Index: slab-0.0.cvs.20060915/main-menu/src/Makefile.in
+Index: slab/main-menu/src/Makefile.in
===================================================================
---- slab-0.0.cvs.20060915.orig/main-menu/src/Makefile.in 2006-09-18 21:43:44.000000000 +0200
-+++ slab-0.0.cvs.20060915/main-menu/src/Makefile.in 2006-09-18 21:43:50.000000000 +0200
+--- slab.orig/main-menu/src/Makefile.in 2006-10-28 14:23:50.000000000 +0200
++++ slab/main-menu/src/Makefile.in 2006-10-28 16:09:09.000000000 +0200
@@ -60,9 +60,9 @@
main_menu_OBJECTS = $(am_main_menu_OBJECTS)
am__DEPENDENCIES_1 =
@@ -136,10 +136,10 @@
all: all-am
-Index: slab-0.0.cvs.20060915/configure.in
+Index: slab/configure.in
===================================================================
---- slab-0.0.cvs.20060915.orig/configure.in 2006-09-18 21:43:44.000000000 +0200
-+++ slab-0.0.cvs.20060915/configure.in 2006-09-18 21:43:50.000000000 +0200
+--- slab.orig/configure.in 2006-06-26 16:11:39.000000000 +0200
++++ slab/configure.in 2006-10-28 16:09:09.000000000 +0200
@@ -52,7 +52,7 @@
AC_SUBST(LIBSLAB_CFLAGS)
AC_SUBST(LIBSLAB_LIBS)
@@ -164,11 +164,11 @@
AC_SUBST(CONTROL_CENTER_CFLAGS)
AC_SUBST(CONTROL_CENTER_LIBS)
-Index: slab-0.0.cvs.20060915/configure
+Index: slab/configure
===================================================================
---- slab-0.0.cvs.20060915.orig/configure 2006-09-18 21:43:44.000000000 +0200
-+++ slab-0.0.cvs.20060915/configure 2006-09-18 21:43:50.000000000 +0200
-@@ -23997,12 +23997,12 @@
+--- slab.orig/configure 2006-10-28 14:23:46.000000000 +0200
++++ slab/configure 2006-10-28 16:09:09.000000000 +0200
+@@ -24172,12 +24172,12 @@
pkg_cv_MAIN_MENU_CFLAGS="$MAIN_MENU_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
@@ -184,7 +184,7 @@
else
pkg_failed=yes
fi
-@@ -24015,12 +24015,12 @@
+@@ -24190,12 +24190,12 @@
pkg_cv_MAIN_MENU_LIBS="$MAIN_MENU_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -200,7 +200,7 @@
else
pkg_failed=yes
fi
-@@ -24039,14 +24039,14 @@
+@@ -24214,14 +24214,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -218,7 +218,7 @@
$MAIN_MENU_PKG_ERRORS
-@@ -24057,7 +24057,7 @@
+@@ -24232,7 +24232,7 @@
and MAIN_MENU_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
@@ -227,7 +227,7 @@
$MAIN_MENU_PKG_ERRORS
-@@ -24370,12 +24370,12 @@
+@@ -24545,12 +24545,12 @@
pkg_cv_APPLICATION_BROWSER_CFLAGS="$APPLICATION_BROWSER_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
@@ -243,7 +243,7 @@
else
pkg_failed=yes
fi
-@@ -24388,12 +24388,12 @@
+@@ -24563,12 +24563,12 @@
pkg_cv_APPLICATION_BROWSER_LIBS="$APPLICATION_BROWSER_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -259,7 +259,7 @@
else
pkg_failed=yes
fi
-@@ -24412,14 +24412,14 @@
+@@ -24587,14 +24587,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -277,7 +277,7 @@
$APPLICATION_BROWSER_PKG_ERRORS
-@@ -24430,7 +24430,7 @@
+@@ -24605,7 +24605,7 @@
and APPLICATION_BROWSER_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
@@ -286,7 +286,7 @@
$APPLICATION_BROWSER_PKG_ERRORS
-@@ -24485,12 +24485,12 @@
+@@ -24660,12 +24660,12 @@
pkg_cv_CONTROL_CENTER_CFLAGS="$CONTROL_CENTER_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
@@ -302,7 +302,7 @@
else
pkg_failed=yes
fi
-@@ -24503,12 +24503,12 @@
+@@ -24678,12 +24678,12 @@
pkg_cv_CONTROL_CENTER_LIBS="$CONTROL_CENTER_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -318,7 +318,7 @@
else
pkg_failed=yes
fi
-@@ -24527,14 +24527,14 @@
+@@ -24702,14 +24702,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -336,7 +336,7 @@
$CONTROL_CENTER_PKG_ERRORS
-@@ -24545,7 +24545,7 @@
+@@ -24720,7 +24720,7 @@
and CONTROL_CENTER_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
Modified: packages/unstable/slab/debian/patches/08_add_place_menu.patch
===================================================================
--- packages/unstable/slab/debian/patches/08_add_place_menu.patch 2006-10-13 16:38:05 UTC (rev 435)
+++ packages/unstable/slab/debian/patches/08_add_place_menu.patch 2006-10-28 16:48:50 UTC (rev 436)
@@ -1,6 +1,7 @@
-diff -urNad slab-0.0.cvs.20060915.orig/main-menu/src/file-area-widget.c slab-0.0.cvs.20060915/main-menu/src/file-area-widget.c
---- slab-0.0.cvs.20060915.orig/main-menu/src/file-area-widget.c 2006-09-16 01:02:18.000000000 +0200
-+++ slab-0.0.cvs.20060915/main-menu/src/file-area-widget.c 2006-09-18 22:03:19.000000000 +0200
+Index: slab/main-menu/src/file-area-widget.c
+===================================================================
+--- slab.orig/main-menu/src/file-area-widget.c 2006-06-26 16:13:03.000000000 +0200
++++ slab/main-menu/src/file-area-widget.c 2006-10-28 16:13:19.000000000 +0200
@@ -44,6 +44,7 @@
#define FILE_CLASS_GCONF_KEY FILE_AREA_GCONF_DIR "/file_class"
#define USER_SPEC_APPS_GCONF_KEY FILE_AREA_GCONF_DIR "/user_specified_apps"
@@ -9,51 +10,48 @@
#define AB_LINK_VISIBLE_GCONF_KEY LOCK_DOWN_GCONF_DIR "/application_browser_link_visible"
#define SHOWABLE_TYPES_GCONF_KEY LOCK_DOWN_GCONF_DIR "/showable_file_types"
#define DISABLE_TERMINAL_GCONF_KEY "/desktop/gnome/lockdown/disable_command_line"
-@@ -102,6 +103,8 @@
- static void tile_table_update_cb (TileTable *, TileTableUpdateEvent *, gpointer);
- static void tile_table_uri_added_cb (TileTable *, TileTableURIAddedEvent *, gpointer);
- static void tile_table_n_rows_notify_cb (GObject *, GParamSpec *, gpointer);
-+static void place_gconf_notify_cb (GConfClient *, guint,
-+ GConfEntry *, gpointer);
+@@ -109,6 +110,9 @@
+ TileTableURIAddedEvent *, gpointer);
+ static void tile_table_n_rows_notify_cb (GObject *, GParamSpec *,
+ gpointer);
++
++ static void place_gconf_notify_cb (GConfClient*, guint, GConfEntry *,
++ gpointer);
- static void user_spec_apps_gconf_notify_cb (GConfClient *, guint, GConfEntry *, gpointer);
+ static void user_spec_apps_gconf_notify_cb (GConfClient *, guint,
+ GConfEntry *, gpointer);
+@@ -204,6 +208,30 @@
+ tiles = get_tiles (this, i);
-@@ -186,6 +189,34 @@
-
- switch (i)
- {
-+ case PLACES:
-+ markup = _("Places");
+ switch (i) {
++ case PLACES:
++ markup = _("Places");
++ connect_gconf_notify
++ (PLACES_GCONF_KEY,
++ place_gconf_notify_cb,
++ this);
++ g_signal_connect(G_OBJECT(table),
++ "tile-table-update",
++ G_CALLBACK
++ (tile_table_update_cb),
++ this);
++ g_signal_connect(G_OBJECT(table),
++ "tile-table-uri-added",
++ G_CALLBACK
++ (tile_table_uri_added_cb),
++ this);
++ g_signal_connect(G_OBJECT(table),
++ "notify::n-rows",
++ G_CALLBACK
++ (tile_table_n_rows_notify_cb),
++ this);
++ break;
+
-+ connect_gconf_notify
-+ (PLACES_GCONF_KEY,
-+ place_gconf_notify_cb,
-+ this);
+
-+ g_signal_connect(G_OBJECT(table),
-+ "tile-table-update",
-+ G_CALLBACK
-+ (tile_table_update_cb),
-+ this);
-+
-+ g_signal_connect(G_OBJECT(table),
-+ "tile-table-uri-added",
-+ G_CALLBACK
-+ (tile_table_uri_added_cb),
-+ this);
-+
-+ g_signal_connect(G_OBJECT(table),
-+ "notify::n-rows",
-+ G_CALLBACK
-+ (tile_table_n_rows_notify_cb),
-+ this);
-+
-+ break;
-+
case USER_SPECIFIED_APPS:
markup = _("Favorite Applications");
-@@ -455,6 +486,31 @@
+@@ -513,6 +541,31 @@
g_free (node->data);
}
}
@@ -67,7 +65,7 @@
+ item = application_tile_get_desktop_item
+ (APPLICATION_TILE (tile));
+ categories = gnome_desktop_item_get_string (item,
-+ GNOME_DESKTOP_ITEM_CATEGORIES);
++ GNOME_DESKTOP_ITEM_CATEGORIES);
+ if (strstr
+ (categories,
+ DESKTOP_ITEM_TERMINAL_EMULATOR_FLAG)){
@@ -83,65 +81,71 @@
+ }
+
- else if (file_class == RECENTLY_USED_APPS)
- {
-@@ -681,6 +737,13 @@
+ else if (file_class == RECENTLY_USED_APPS) {
+ files = get_recent_files (RECENT_APPS_FILE_PATH);
+@@ -754,6 +807,14 @@
}
static void
+place_gconf_notify_cb (GConfClient * client, guint conn_id,
-+ GConfEntry * entry, gpointer user_data)
++ GConfEntry * entry, gpointer user_data)
+{
-+ update_table (FILE_AREA_WIDGET (user_data), PLACES );
++ update_table (FILE_AREA_WIDGET (user_data), PLACES );
+}
+
++
+static void
- recent_files_store_monitor_cb (GnomeVFSMonitorHandle * handle, const gchar * monitor_uri,
- const gchar * info_uri, GnomeVFSMonitorEventType type, gpointer user_data)
- {
-diff -urNad slab-0.0.cvs.20060915.orig/main-menu/src/main-menu-conf.c slab-0.0.cvs.20060915/main-menu/src/main-menu-conf.c
---- slab-0.0.cvs.20060915.orig/main-menu/src/main-menu-conf.c 2006-09-16 01:02:18.000000000 +0200
-+++ slab-0.0.cvs.20060915/main-menu/src/main-menu-conf.c 2006-09-18 22:06:22.000000000 +0200
-@@ -179,6 +179,7 @@
- conf->lock_down_conf->file_area_showable_types[USER_SPECIFIED_APPS] = FALSE;
- conf->lock_down_conf->file_area_showable_types[RECENTLY_USED_APPS] = FALSE;
- conf->lock_down_conf->file_area_showable_types[RECENT_FILES] = FALSE;
+ recent_files_store_monitor_cb (GnomeVFSMonitorHandle * handle,
+ const gchar * monitor_uri,
+ const gchar * info_uri,
+Index: slab/main-menu/src/main-menu-conf.c
+===================================================================
+--- slab.orig/main-menu/src/main-menu-conf.c 2006-06-26 16:13:03.000000000 +0200
++++ slab/main-menu/src/main-menu-conf.c 2006-10-28 16:14:20.000000000 +0200
+@@ -194,6 +194,7 @@
+ conf->lock_down_conf->file_area_showable_types [RECENTLY_USED_APPS] =
+ FALSE;
+ conf->lock_down_conf->file_area_showable_types [RECENT_FILES] = FALSE;
+ conf->lock_down_conf->file_area_showable_types [PLACES] = FALSE;
- for (node = showable_file_types; node; node = node->next)
- {
-@@ -539,10 +540,11 @@
- g_printf (" ab_link_visible: %d\n", conf->lock_down_conf->ab_link_visible);
- g_printf (" system_area_visible: %d\n", conf->lock_down_conf->system_area_visible);
- g_printf (" status_area_visible: %d\n", conf->lock_down_conf->status_area_visible);
-- g_printf (" file_area_showable_types: [%d,%d,%d]\n",
-+ g_printf (" file_area_showable_types: [%d,%d,%d,%d]\n",
- conf->lock_down_conf->file_area_showable_types[USER_SPECIFIED_APPS],
- conf->lock_down_conf->file_area_showable_types[RECENTLY_USED_APPS],
-- conf->lock_down_conf->file_area_showable_types[RECENT_FILES]);
-+ conf->lock_down_conf->file_area_showable_types[RECENT_FILES],
-+ conf->lock_down_conf->file_area_showable_types [PLACES]);
+ for (node = showable_file_types; node; node = node->next) {
+ type = GPOINTER_TO_INT (node->data);
+@@ -578,13 +579,15 @@
+ conf->lock_down_conf->system_area_visible);
+ g_printf (" status_area_visible: %d\n",
+ conf->lock_down_conf->status_area_visible);
+- g_printf (" file_area_showable_types: [%d,%d,%d]\n",
++ g_printf (" file_area_showable_types: [%d,%d,%d,%d]\n",
+ conf->lock_down_conf->
+ file_area_showable_types [USER_SPECIFIED_APPS],
+ conf->lock_down_conf->
+ file_area_showable_types [RECENTLY_USED_APPS],
+ conf->lock_down_conf->
+- file_area_showable_types [RECENT_FILES]);
++ file_area_showable_types [RECENT_FILES],
++ conf->lock_down_conf->
++ file_area_showable_types [PLACES]);
g_printf ("\n");
}
-diff -urNad slab-0.0.cvs.20060915.orig/main-menu/src/main-menu-conf.h slab-0.0.cvs.20060915/main-menu/src/main-menu-conf.h
---- slab-0.0.cvs.20060915.orig/main-menu/src/main-menu-conf.h 2006-09-16 01:02:18.000000000 +0200
-+++ slab-0.0.cvs.20060915/main-menu/src/main-menu-conf.h 2006-09-18 21:47:49.000000000 +0200
-@@ -38,9 +38,10 @@
+Index: slab/main-menu/src/main-menu-conf.h
+===================================================================
+--- slab.orig/main-menu/src/main-menu-conf.h 2006-06-26 16:13:03.000000000 +0200
++++ slab/main-menu/src/main-menu-conf.h 2006-10-28 16:14:46.000000000 +0200
+@@ -35,7 +35,8 @@
USER_SPECIFIED_APPS = 0,
RECENTLY_USED_APPS = 1,
RECENT_FILES = 2,
-+ PLACES = 3,
-
- /* must always be last and equal (in value) to the number of possible file class types */
-- FILE_CLASS_SENTINEL = 3
-+ FILE_CLASS_SENTINEL = 4
+- FILE_CLASS_SENTINEL = 3 /* must always be last and equal (in value)
++ PLACES = 3,
++ FILE_CLASS_SENTINEL = 4 /* must always be last and equal (in value)
+ to the number of possible file class types
+ */
} FileClass;
-
- typedef enum
-diff -urNad slab-0.0.cvs.20060915.orig/main-menu/etc/slab.schemas.in.in slab-0.0.cvs.20060915/main-menu/etc/slab.schemas.in.in
---- slab-0.0.cvs.20060915.orig/main-menu/etc/slab.schemas.in.in 2006-09-18 22:20:39.000000000 +0200
-+++ slab-0.0.cvs.20060915/main-menu/etc/slab.schemas.in.in 2006-09-18 22:19:28.000000000 +0200
+Index: slab/main-menu/etc/slab.schemas.in.in
+===================================================================
+--- slab.orig/main-menu/etc/slab.schemas.in.in 2006-10-28 16:09:20.000000000 +0200
++++ slab/main-menu/etc/slab.schemas.in.in 2006-10-28 16:10:18.000000000 +0200
@@ -12,30 +12,18 @@
<long>.desktop files for "Favorite Applications"</long>
</locale>
Modified: packages/unstable/slab/debian/patches/10_default_commands.patch
===================================================================
--- packages/unstable/slab/debian/patches/10_default_commands.patch 2006-10-13 16:38:05 UTC (rev 435)
+++ packages/unstable/slab/debian/patches/10_default_commands.patch 2006-10-28 16:48:50 UTC (rev 436)
@@ -1,6 +1,7 @@
-diff -urNad slab-0.0.cvs.20060705.old/control-center/etc/control-center.schemas.in slab-0.0.cvs.20060705/control-center/etc/control-center.schemas.in
---- slab-0.0.cvs.20060705.old/control-center/etc/control-center.schemas.in 2006-08-23 09:00:54.000000000 -0300
-+++ slab-0.0.cvs.20060705/control-center/etc/control-center.schemas.in 2006-09-16 02:03:07.000000000 -0300
+Index: slab/control-center/etc/control-center.schemas.in
+===================================================================
+--- slab.orig/control-center/etc/control-center.schemas.in 2006-06-26 16:11:48.000000000 +0200
++++ slab/control-center/etc/control-center.schemas.in 2006-10-28 16:14:57.000000000 +0200
@@ -7,7 +7,7 @@
<type>list</type>
<list_type>string</list_type>
@@ -10,9 +11,10 @@
<short>Task names and associated .desktop files</short>
<long>The task name to be displayed in the control-center (thus needing to be translated) followed by a ";" separator then the filename of an associated .desktop file to launch for that task.</long>
</locale>
-diff -urNad slab-0.0.cvs.20060705.old/main-menu/etc/slab.schemas.in.in slab-0.0.cvs.20060705/main-menu/etc/slab.schemas.in.in
---- slab-0.0.cvs.20060705.old/main-menu/etc/slab.schemas.in.in 2006-08-23 09:00:54.000000000 -0300
-+++ slab-0.0.cvs.20060705/main-menu/etc/slab.schemas.in.in 2006-09-16 02:00:46.000000000 -0300
+Index: slab/main-menu/etc/slab.schemas.in.in
+===================================================================
+--- slab.orig/main-menu/etc/slab.schemas.in.in 2006-10-28 16:10:18.000000000 +0200
++++ slab/main-menu/etc/slab.schemas.in.in 2006-10-28 16:14:57.000000000 +0200
@@ -6,7 +6,7 @@
<owner>gnome-main-menu</owner>
<type>list</type>
@@ -22,7 +24,7 @@
<locale name="C">
<short>.desktop files for "Favorite Applications"</short>
<long>.desktop files for "Favorite Applications"</long>
-@@ -127,10 +127,10 @@
+@@ -115,10 +115,10 @@
<applyto>/desktop/gnome/applications/main-menu/network_config_tool</applyto>
<owner>gnome-main-menu</owner>
<type>string</type>
Modified: packages/unstable/slab/debian/patches/11_fix_control_center.patch
===================================================================
--- packages/unstable/slab/debian/patches/11_fix_control_center.patch 2006-10-13 16:38:05 UTC (rev 435)
+++ packages/unstable/slab/debian/patches/11_fix_control_center.patch 2006-10-28 16:48:50 UTC (rev 436)
@@ -1,11 +1,13 @@
---- slab-0.0.cvs.20060915/control-center/src/control-center.c.orig 2006-09-19 15:04:53.000000000 +0200
-+++ slab-0.0.cvs.20060915/control-center/src/control-center.c 2006-09-19 15:04:32.000000000 +0200
-@@ -139,7 +139,7 @@
+Index: slab/control-center/src/control-center.c
+===================================================================
+--- slab.orig/control-center/src/control-center.c 2006-06-26 16:11:50.000000000 +0200
++++ slab/control-center/src/control-center.c 2006-10-28 16:15:25.000000000 +0200
+@@ -140,7 +140,7 @@
}
AppShellData *app_data =
-- appshelldata_new ("preferences.menu", NULL, CONTROL_CENTER_PREFIX,
-+ appshelldata_new ("gnome-settings.menu", NULL, CONTROL_CENTER_PREFIX,
- GTK_ICON_SIZE_DIALOG);
+- appshelldata_new ("preferences.menu", NULL,
++ appshelldata_new ("gnome-settings.menu", NULL,
+ CONTROL_CENTER_PREFIX,
+ GTK_ICON_SIZE_DIALOG);
generate_categories (app_data);
- GSList *actions = get_actions_list ();
More information about the Pkg-galago-commit
mailing list