[Pkg-galago-commit] r292 - packages/unstable/slab/debian/patches
Riccardo Setti
giskard-guest at costa.debian.org
Sun Aug 27 16:20:53 UTC 2006
Author: giskard-guest
Date: 2006-08-27 16:20:52 +0000 (Sun, 27 Aug 2006)
New Revision: 292
Modified:
packages/unstable/slab/debian/patches/08_add_place_menu.patch
Log:
updated 08 patch
Modified: packages/unstable/slab/debian/patches/08_add_place_menu.patch
===================================================================
--- packages/unstable/slab/debian/patches/08_add_place_menu.patch 2006-08-27 12:06:28 UTC (rev 291)
+++ packages/unstable/slab/debian/patches/08_add_place_menu.patch 2006-08-27 16:20:52 UTC (rev 292)
@@ -1,6 +1,59 @@
-diff -urNad ../debian/pkg-galago/unstable/tarballs/slab-0.0.cvs.20060705.orig/main-menu/src/file-area-widget.c slab/main-menu/src/file-area-widget.c
---- ../debian/pkg-galago/unstable/tarballs/slab-0.0.cvs.20060705.orig/main-menu/src/file-area-widget.c 2006-08-23 14:00:54.000000000 +0200
-+++ slab/main-menu/src/file-area-widget.c 2006-08-26 13:19:25.000000000 +0200
+diff -urNad ../debian/pkg-galago/unstable/tarballs/slab-0.0.cvs.20060705.orig/main-menu/src/main-menu-conf.h slab/main-menu/src/main-menu-conf.h
+--- ../debian/pkg-galago/unstable/tarballs/slab-0.0.cvs.20060705.orig/main-menu/src/main-menu-conf.h 2006-08-23 14:00:54.000000000 +0200
++++ slab/main-menu/src/main-menu-conf.h 2006-08-26 13:22:51.000000000 +0200
+@@ -35,7 +35,8 @@
+ USER_SPECIFIED_APPS = 0,
+ RECENTLY_USED_APPS = 1,
+ RECENT_FILES = 2,
+- 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;
+diff -urNad slab-0.0.cvs.20060705.orig/main-menu/etc/slab.schemas.in.in slab-0.0.cvs.20060705/main-menu/etc/slab.schemas.in.in
+--- slab-0.0.cvs.20060705.orig/main-menu/etc/slab.schemas.in.in 2006-08-23 14:00:54.000000000 +0200
++++ slab-0.0.cvs.20060705/main-menu/etc/slab.schemas.in.in 2006-08-24 12:33:50.000000000 +0200
+@@ -12,6 +12,20 @@
+ <long>.desktop files for "Favorite Applications"</long>
+ </locale>
+ </schema>
++
++ <schema>
++ <key>/schemas/desktop/gnome/applications/main-menu/file-area/places</key>
++ <applyto>/desktop/gnome/applications/main-menu/file-area/places</applyto>
++ <owner>gnome-main-menu</owner>
++ <type>list</type>
++ <list_type>string</list_type>
++ <default>[nautilus-computer.desktop,nautilus-home.desktop,network-scheme.desktop,nautilus-cd-burner.desktop,beagle-search.desk top]</default>
++
++ <locale name="C">
++ <short>.desktop files for "Places"</short>
++ <long>.desktop files for "Places"</long>
++ </locale>
++ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/applications/main-menu/uninstall_package_command</key>
+diff -urNad slab-0.0.cvs.20060705.orig/main-menu/etc/slab.schemas.in.in slab-0.0.cvs.20060705/main-menu/etc/slab.schemas.in.in
+--- slab-0.0.cvs.20060705.orig/main-menu/etc/slab.schemas.in.in 2006-08-23 14:00:54.000000000 +0200
++++ slab-0.0.cvs.20060705/main-menu/etc/slab.schemas.in.in 2006-08-27 18:11:09.000000000 +0200
+@@ -322,10 +322,10 @@
+ <owner>gnome-main-menu</owner>
+ <type>list</type>
+ <list_type>int</list_type>
+- <default>[0,1,2]</default>
++ <default>[0,1,2,3]</default>
+ <locale name="C">
+ <short>lock-down configuration of the file area</short>
+- <long>contains the list (in no particular order) of allowable file types to show in the file area. possible values (see also the note for /desktop/gnome/applications/main-menu/file-area/file_class): 0 [USER_SPECIFIED_APPS], 1 [RECENTLY_USED_APPS], 2 [RECENT_FILES]. RECENTLY_USED_APPS is the list of recently used (instantiated with the main-menu or the application-browser). USER_SPECIFIED_APPS is equivalent to "Favorite Applications". RECENT_FILES is the list of files from ~/.recently-used.</long>
++ <long>contains the list (in no particular order) of allowable file types to show in the file area. possible values (see also the note for /desktop/gnome/applications/main-menu/file-area/file_class): 0 [USER_SPECIFIED_APPS], 1 [RECENTLY_USED_APPS], 2 [RECENT_FILES]. 3 [PLACES]. RECENTLY_USED_APPS is the list of recently used (instantiated with the main-menu or the application-browser). USER_SPECIFIED_APPS is equivalent to "Favorite Applications". RECENT_FILES is the list of files from ~/.recently-used, PLACE is the list of possible place (home, net, cd-rom)</long>
+ </locale>
+ </schema>
+ </schemalist>
+diff -urNad slab-0.0.cvs.20060705.orig/main-menu/src/file-area-widget.c slab-0.0.cvs.20060705/main-menu/src/file-area-widget.c
+--- slab-0.0.cvs.20060705.orig/main-menu/src/file-area-widget.c 2006-08-23 14:00:54.000000000 +0200
++++ slab-0.0.cvs.20060705/main-menu/src/file-area-widget.c 2006-08-27 18:09:10.000000000 +0200
@@ -44,10 +44,10 @@
#define FILE_CLASS_GCONF_KEY FILE_AREA_GCONF_DIR "/file_class"
#define USER_SPEC_APPS_GCONF_KEY FILE_AREA_GCONF_DIR "/user_specified_apps"
@@ -112,40 +165,35 @@
recent_files_store_monitor_cb (GnomeVFSMonitorHandle * handle,
const gchar * monitor_uri,
const gchar * info_uri,
-diff -urNad ../debian/pkg-galago/unstable/tarballs/slab-0.0.cvs.20060705.orig/main-menu/src/main-menu-conf.h slab/main-menu/src/main-menu-conf.h
---- ../debian/pkg-galago/unstable/tarballs/slab-0.0.cvs.20060705.orig/main-menu/src/main-menu-conf.h 2006-08-23 14:00:54.000000000 +0200
-+++ slab/main-menu/src/main-menu-conf.h 2006-08-26 13:22:51.000000000 +0200
-@@ -35,7 +35,8 @@
- USER_SPECIFIED_APPS = 0,
- RECENTLY_USED_APPS = 1,
- RECENT_FILES = 2,
-- 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;
-diff -urNad slab-0.0.cvs.20060705.orig/main-menu/etc/slab.schemas.in.in slab-0.0.cvs.20060705/main-menu/etc/slab.schemas.in.in
---- slab-0.0.cvs.20060705.orig/main-menu/etc/slab.schemas.in.in 2006-08-23 14:00:54.000000000 +0200
-+++ slab-0.0.cvs.20060705/main-menu/etc/slab.schemas.in.in 2006-08-24 12:33:50.000000000 +0200
-@@ -12,6 +12,20 @@
- <long>.desktop files for "Favorite Applications"</long>
- </locale>
- </schema>
-+
-+ <schema>
-+ <key>/schemas/desktop/gnome/applications/main-menu/file-area/places</key>
-+ <applyto>/desktop/gnome/applications/main-menu/file-area/places</applyto>
-+ <owner>gnome-main-menu</owner>
-+ <type>list</type>
-+ <list_type>string</list_type>
-+ <default>[nautilus-computer.desktop,nautilus-home.desktop,network-scheme.desktop,nautilus-cd-burner.desktop,beagle-search.desk top]</default>
-+
-+ <locale name="C">
-+ <short>.desktop files for "Places"</short>
-+ <long>.desktop files for "Places"</long>
-+ </locale>
-+ </schema>
+diff -urNad slab-0.0.cvs.20060705.orig/main-menu/src/main-menu-conf.c slab-0.0.cvs.20060705/main-menu/src/main-menu-conf.c
+--- slab-0.0.cvs.20060705.orig/main-menu/src/main-menu-conf.c 2006-08-23 14:00:54.000000000 +0200
++++ slab-0.0.cvs.20060705/main-menu/src/main-menu-conf.c 2006-08-27 18:09:18.000000000 +0200
+@@ -194,7 +194,8 @@
+ 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) {
+ type = GPOINTER_TO_INT (node->data);
- <schema>
- <key>/schemas/desktop/gnome/applications/main-menu/uninstall_package_command</key>
+@@ -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");
+ }
+
More information about the Pkg-galago-commit
mailing list