[Pkg-galago-commit] r344 - packages/unstable/slab/debian/patches
Riccardo Setti
giskard-guest at costa.debian.org
Mon Sep 18 20:07:24 UTC 2006
Author: giskard-guest
Date: 2006-09-18 20:07:23 +0000 (Mon, 18 Sep 2006)
New Revision: 344
Modified:
packages/unstable/slab/debian/patches/05_binary_locations
packages/unstable/slab/debian/patches/08_add_place_menu.patch
Log:
updated 08 slab patch
Modified: packages/unstable/slab/debian/patches/05_binary_locations
===================================================================
--- packages/unstable/slab/debian/patches/05_binary_locations 2006-09-18 19:47:56 UTC (rev 343)
+++ packages/unstable/slab/debian/patches/05_binary_locations 2006-09-18 20:07:23 UTC (rev 344)
@@ -1,17 +1,15 @@
-Index: 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-25 19:52:39.000000000 +0200
-+++ slab-0.0.cvs.20060705/main-menu/etc/slab.schemas.in.in 2006-08-25 19:52:39.000000000 +0200
-@@ -81,7 +81,7 @@
+--- slab-0.0.cvs.20060915/main-menu/etc/slab.schemas.in.in.orig 2006-09-18 21:43:07.000000000 +0200
++++ slab-0.0.cvs.20060915/main-menu/etc/slab.schemas.in.in 2006-09-18 21:44:28.000000000 +0200
+@@ -67,7 +67,7 @@
<applyto>/desktop/gnome/applications/main-menu/system-area/control_center_item</applyto>
<owner>gnome-main-menu</owner>
<type>string</type>
- <default>@DATADIR@/applications/control-center.desktop</default>
-+ <default>/usr/share/gnome-main-menu/control-center.desktop</default>
++ <default>/usr/share/gnome-main-menu/control-center.desktop<default>
<locale name="C">
<short>control center item .desktop file</short>
<long>control center item .desktop file</long>
-@@ -105,7 +105,7 @@
+@@ -91,7 +91,7 @@
<applyto>/desktop/gnome/applications/main-menu/application_browser</applyto>
<owner>gnome-main-menu</owner>
<type>string</type>
Modified: packages/unstable/slab/debian/patches/08_add_place_menu.patch
===================================================================
--- packages/unstable/slab/debian/patches/08_add_place_menu.patch 2006-09-18 19:47:56 UTC (rev 343)
+++ packages/unstable/slab/debian/patches/08_add_place_menu.patch 2006-09-18 20:07:23 UTC (rev 344)
@@ -1,45 +1,47 @@
-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>
+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-06-26 16:13:03.000000000 +0200
++++ slab-0.0.cvs.20060915/main-menu/etc/slab.schemas.in.in 2006-09-18 21:52:02.000000000 +0200
+@@ -13,6 +13,20 @@
</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/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 @@
+ <applyto>/desktop/gnome/applications/main-menu/uninstall_package_command</applyto>
+@@ -67,7 +81,7 @@
+ <applyto>/desktop/gnome/applications/main-menu/system-area/control_center_item</applyto>
<owner>gnome-main-menu</owner>
+ <type>string</type>
+- <default>@DATADIR@/applications/control-center.desktop</default>
++ <default>/usr/share/gnome-main-menu/control-center.desktop<default>
+ <locale name="C">
+ <short>control center item .desktop file</short>
+ <long>control center item .desktop file</long>
+@@ -91,7 +105,7 @@
+ <applyto>/desktop/gnome/applications/main-menu/application_browser</applyto>
+ <owner>gnome-main-menu</owner>
+ <type>string</type>
+- <default>@DATADIR@/applications/application-browser.desktop</default>
++ <default>/usr/share/gnome-main-menu/application-browser.desktop</default>
+ <locale name="C">
+ <short>.desktop path for the application browser</short>
+ <long>.desktop path for the application browser</long>
+@@ -322,10 +336,10 @@
+ <owner>gnome-main-menu</owner>
<type>list</type>
<list_type>int</list_type>
- <default>[0,1,2]</default>
@@ -47,14 +49,14 @@
<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>
++ <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 @@
+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
+@@ -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"
#define ITEM_LIMIT_GCONF_KEY FILE_AREA_GCONF_DIR "/item_limit"
@@ -62,138 +64,133 @@
#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"
--
- #define DESKTOP_ITEM_TERMINAL_EMULATOR_FLAG "TerminalEmulator"
+@@ -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);
- G_DEFINE_TYPE (FileAreaWidget, file_area_widget, GTK_TYPE_VBOX)
-@@ -109,7 +109,8 @@
- 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 +205,34 @@
- tiles = get_tiles (this, i);
+@@ -186,6 +189,34 @@
- 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;
-+
+ 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;
++
case USER_SPECIFIED_APPS:
markup = _("Favorite Applications");
-@@ -400,6 +429,7 @@
-
- switch (file_class) {
- case RECENTLY_USED_APPS:
-+ case PLACES:
- case USER_SPECIFIED_APPS:
- gtk_button_set_label (priv->browser_link,
- _("More Applications..."));
-@@ -513,7 +543,31 @@
+@@ -455,6 +486,31 @@
g_free (node->data);
}
}
--
-+ else if (file_class == PLACES) {
-+ files = get_gconf_value (PLACES_GCONF_KEY);
-+ for (node = files; node; node = node->next) {
-+
-+ tile = application_tile_new ((gchar *) node->data);
-+
-+ if(disable_term) {
-+ item = application_tile_get_desktop_item
-+ (APPLICATION_TILE (tile));
-+ categories = gnome_desktop_item_get_string (item,
-+ GNOME_DESKTOP_ITEM_CATEGORIES);
-+ if (strstr
-+ (categories,
-+ DESKTOP_ITEM_TERMINAL_EMULATOR_FLAG)){
-+ gtk_widget_destroy(tile);
-+ tile = NULL;
-+ }
-+ }
-+
-+ if (tile)
-+ tiles = g_list_append(tiles, tile);
-+
-+ }
-+ }
-+
- else if (file_class == RECENTLY_USED_APPS) {
- files = get_recent_files (RECENT_APPS_FILE_PATH);
++ else if (file_class == PLACES) {
++ files = get_gconf_value (PLACES_GCONF_KEY);
++ for (node = files; node; node = node->next) {
++
++ tile = application_tile_new ((gchar *) node->data);
++
++ if(disable_term) {
++ item = application_tile_get_desktop_item
++ (APPLICATION_TILE (tile));
++ categories = gnome_desktop_item_get_string (item,
++ GNOME_DESKTOP_ITEM_CATEGORIES);
++ if (strstr
++ (categories,
++ DESKTOP_ITEM_TERMINAL_EMULATOR_FLAG)){
++ gtk_widget_destroy(tile);
++ tile = NULL;
++ }
++ }
++
++ if (tile)
++ tiles = g_list_append(tiles, tile);
++
++ }
++ }
++
-@@ -754,6 +808,12 @@
+ else if (file_class == RECENTLY_USED_APPS)
+ {
+@@ -681,6 +737,13 @@
}
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,
-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;
--
+ 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;
+ 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);
-@@ -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]);
+ 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]);
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 @@
+ 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
+ } FileClass;
+
+ typedef enum
More information about the Pkg-galago-commit
mailing list