[Pkg-galago-commit] r289 - packages/unstable/slab/debian/patches
Riccardo Setti
giskard-guest at costa.debian.org
Sat Aug 26 11:33:33 UTC 2006
Author: giskard-guest
Date: 2006-08-26 11:33:25 +0000 (Sat, 26 Aug 2006)
New Revision: 289
Added:
packages/unstable/slab/debian/patches/02_fix_recent_app_menu.patch.old
packages/unstable/slab/debian/patches/02_remove_recent_app_menu.patch.old
packages/unstable/slab/debian/patches/07_add_place_menu.patch.old
packages/unstable/slab/debian/patches/08_add_place_menu.patch
Removed:
packages/unstable/slab/debian/patches/02_fix_recent_app_menu.patch
packages/unstable/slab/debian/patches/new02_remove_recent_app_menu.patch
packages/unstable/slab/debian/patches/new07_add_place_menu.patch
Modified:
packages/unstable/slab/debian/patches/series
Log:
another patch, i will write about it later
Deleted: packages/unstable/slab/debian/patches/02_fix_recent_app_menu.patch
===================================================================
--- packages/unstable/slab/debian/patches/02_fix_recent_app_menu.patch 2006-08-26 10:17:01 UTC (rev 288)
+++ packages/unstable/slab/debian/patches/02_fix_recent_app_menu.patch 2006-08-26 11:33:25 UTC (rev 289)
@@ -1,214 +0,0 @@
-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/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-24 12:50:03.000000000 +0200
-@@ -43,6 +43,7 @@
- #define APP_BROWSER_GCONF_KEY MAIN_MENU_GCONF_DIR "/application_browser"
- #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 PLACES_GCONF_KEY FILE_AREA_GCONF_DIR "/places"
- #define ITEM_LIMIT_GCONF_KEY FILE_AREA_GCONF_DIR "/item_limit"
- #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"
-@@ -93,24 +94,27 @@
- static void tile_activated_cb (Tile *, TileEvent *, gpointer);
- static void tile_action_triggered_cb (Tile *, TileEvent *, TileAction *,
- gpointer);
--
-+/*
- static void recent_apps_store_monitor_cb (GnomeVFSMonitorHandle *,
- const gchar *, const gchar *,
- GnomeVFSMonitorEventType,
- gpointer);
-- static void recent_files_store_monitor_cb (GnomeVFSMonitorHandle *,
-+*/
-+ static void recent_files_store_monitor_cb (GnomeVFSMonitorHandle *,
- const gchar *, const gchar *,
- GnomeVFSMonitorEventType,
- gpointer);
--
-- static void tile_table_update_cb (TileTable *, TileTableUpdateEvent *,
-+
-+ 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 user_spec_apps_gconf_notify_cb (GConfClient *, guint,
-+
-+ static void places_gconf_notify_cb (GConfClient *, guint,
-+ GConfEntry *, gpointer);
-+ static void user_spec_apps_gconf_notify_cb (GConfClient *, guint,
- GConfEntry *, gpointer);
-
- GtkWidget *file_area_widget_new (MainMenuUI * ui,
-@@ -126,8 +130,7 @@
- GtkTreeIter iter_cur;
-
- GtkTreeIter iter;
-- gint page_id;
--
-+ gint page_id;
- GList *showable_types_list;
- gboolean showable [FILE_CLASS_SENTINEL];
-
-@@ -232,25 +235,52 @@
- break;
-
- case RECENTLY_USED_APPS:
-- markup = _("Recently Used Applications");
-+/* markup = _("Recently Used Applications"); */
-+ markup = _("Places");
-
-- filename =
-+/* filename =
- g_build_filename (g_get_home_dir (),
- RECENT_APPS_FILE_PATH,
- NULL);
-+*/
-+ connect_gconf_notify
-+ (PLACES_GCONF_KEY,
-+ places_gconf_notify_cb,
-+ this);
-
-- uri = gnome_vfs_get_uri_from_local_path
-+
-+/* uri = gnome_vfs_get_uri_from_local_path
- (filename);
-+*/
-+ g_signal_connect (G_OBJECT (table),
-+ "tile-table-update",
-+ G_CALLBACK
-+ (tile_table_update_cb),
-+ this);
-
-- gnome_vfs_monitor_add (&handle,
-+/* gnome_vfs_monitor_add (&handle,
- uri,
- GNOME_VFS_MONITOR_FILE,
- recent_apps_store_monitor_cb,
- this);
-+*/
-+ g_signal_connect (G_OBJECT (table),
-+ "tile-table-uri-added",
-+ G_CALLBACK
-+ (tile_table_uri_added_cb),
-+ this);
-
-+/*
- g_free (filename);
- g_free (uri);
-- break;
-+*/
-+ g_signal_connect (G_OBJECT (table),
-+ "notify::n-rows",
-+ G_CALLBACK
-+ (tile_table_n_rows_notify_cb),
-+ this);
-+
-+ break;
-
- case RECENT_FILES:
- markup = _("Recent Documents");
-@@ -515,10 +545,10 @@
- }
-
- else if (file_class == RECENTLY_USED_APPS) {
-- files = get_recent_files (RECENT_APPS_FILE_PATH);
--
-+/* files = get_recent_files (RECENT_APPS_FILE_PATH); */
-+ files = get_gconf_value (PLACES_GCONF_KEY);
- for (node = files; node; node = node->next) {
-- desktop_item_url =
-+/* desktop_item_url =
- egg_recent_item_get_uri ((EggRecentItem *)
- node->data);
-
-@@ -541,13 +571,36 @@
- tile = NULL;
- }
- }
-+*/
-+ tile = application_tile_new ((gchar *) node->data);
-
-- if (tile)
-+ if (disable_term) {
-+ item = application_tile_get_desktop_item
-+ (APPLICATION_TILE (tile));
-+ categories =
-+ gnome_desktop_item_get_string (item,
-+ GNOME_DESKTOP_ITEM_CATEGORIES);
-+
-+/* if (tile)
- tiles = g_list_append (tiles, tile);
-- }
-+*/
-+ if (strstr
-+ (categories,
-+ DESKTOP_ITEM_TERMINAL_EMULATOR_FLAG)) {
-+ gtk_widget_destroy (tile);
-+ tile = NULL;
-+ }
-
-+ }
-+/*
- g_free (desktop_item_url);
- egg_recent_item_unref (node->data);
-+*/
-+ if (tile)
-+ tiles = g_list_append (tiles, tile);
-+
-+ g_free (node->data);
-+
- }
- }
-
-@@ -742,7 +795,7 @@
- )
- main_menu_ui_close (priv->ui, FALSE);
- }
--
-+/*
- static void
- recent_apps_store_monitor_cb (GnomeVFSMonitorHandle * handle,
- const gchar * monitor_uri,
-@@ -752,6 +805,14 @@
- {
- update_table (FILE_AREA_WIDGET (user_data), RECENTLY_USED_APPS);
- }
-+*/
-+
-+static void
-+places_gconf_notify_cb (GConfClient * client, guint conn_id,
-+ GConfEntry * entry, gpointer user_data)
-+{
-+ update_table (FILE_AREA_WIDGET (user_data), RECENTLY_USED_APPS);
-+}
-
- static void
- recent_files_store_monitor_cb (GnomeVFSMonitorHandle * handle,
Copied: packages/unstable/slab/debian/patches/02_fix_recent_app_menu.patch.old (from rev 287, packages/unstable/slab/debian/patches/02_fix_recent_app_menu.patch)
Added: packages/unstable/slab/debian/patches/02_remove_recent_app_menu.patch.old
===================================================================
--- packages/unstable/slab/debian/patches/02_remove_recent_app_menu.patch.old 2006-08-26 10:17:01 UTC (rev 288)
+++ packages/unstable/slab/debian/patches/02_remove_recent_app_menu.patch.old 2006-08-26 11:33:25 UTC (rev 289)
@@ -0,0 +1,133 @@
+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-25 23:02:35.000000000 +0200
+@@ -93,24 +93,25 @@
+ static void tile_activated_cb (Tile *, TileEvent *, gpointer);
+ static void tile_action_triggered_cb (Tile *, TileEvent *, TileAction *,
+ gpointer);
+-
++/*
+ static void recent_apps_store_monitor_cb (GnomeVFSMonitorHandle *,
+ const gchar *, const gchar *,
+ GnomeVFSMonitorEventType,
+ gpointer);
+- static void recent_files_store_monitor_cb (GnomeVFSMonitorHandle *,
++*/
++ static void recent_files_store_monitor_cb (GnomeVFSMonitorHandle *,
+ const gchar *, const gchar *,
+ GnomeVFSMonitorEventType,
+ gpointer);
+-
+- static void tile_table_update_cb (TileTable *, TileTableUpdateEvent *,
++
++ 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 user_spec_apps_gconf_notify_cb (GConfClient *, guint,
++
++ static void user_spec_apps_gconf_notify_cb (GConfClient *, guint,
+ GConfEntry *, gpointer);
+
+ GtkWidget *file_area_widget_new (MainMenuUI * ui,
+@@ -126,8 +127,7 @@
+ GtkTreeIter iter_cur;
+
+ GtkTreeIter iter;
+- gint page_id;
+-
++ gint page_id;
+ GList *showable_types_list;
+ gboolean showable [FILE_CLASS_SENTINEL];
+
+@@ -232,25 +232,32 @@
+ break;
+
+ case RECENTLY_USED_APPS:
+- markup = _("Recently Used Applications");
++/* markup = _("Recently Used Applications"); */
++ markup = _("Places");
+
+- filename =
++/* filename =
+ g_build_filename (g_get_home_dir (),
+ RECENT_APPS_FILE_PATH,
+ NULL);
++*/
+
+- uri = gnome_vfs_get_uri_from_local_path
++/* uri = gnome_vfs_get_uri_from_local_path
+ (filename);
++*/
+
+- gnome_vfs_monitor_add (&handle,
++/* gnome_vfs_monitor_add (&handle,
+ uri,
+ GNOME_VFS_MONITOR_FILE,
+ recent_apps_store_monitor_cb,
+ this);
++*/
+
++/*
+ g_free (filename);
+ g_free (uri);
+- break;
++*/
++
++ break;
+
+ case RECENT_FILES:
+ markup = _("Recent Documents");
+@@ -515,10 +522,9 @@
+ }
+
+ else if (file_class == RECENTLY_USED_APPS) {
+- files = get_recent_files (RECENT_APPS_FILE_PATH);
+-
++/* files = get_recent_files (RECENT_APPS_FILE_PATH); */
+ for (node = files; node; node = node->next) {
+- desktop_item_url =
++/* desktop_item_url =
+ egg_recent_item_get_uri ((EggRecentItem *)
+ node->data);
+
+@@ -541,13 +547,16 @@
+ tile = NULL;
+ }
+ }
++*/
+
+- if (tile)
++/* if (tile)
+ tiles = g_list_append (tiles, tile);
+- }
+-
++*/
++/*
+ g_free (desktop_item_url);
+ egg_recent_item_unref (node->data);
++*/
++
+ }
+ }
+
+@@ -742,7 +751,7 @@
+ )
+ main_menu_ui_close (priv->ui, FALSE);
+ }
+-
++/*
+ static void
+ recent_apps_store_monitor_cb (GnomeVFSMonitorHandle * handle,
+ const gchar * monitor_uri,
+@@ -752,6 +761,7 @@
+ {
+ update_table (FILE_AREA_WIDGET (user_data), RECENTLY_USED_APPS);
+ }
++*/
+
+ static void
+ recent_files_store_monitor_cb (GnomeVFSMonitorHandle * handle,
Copied: packages/unstable/slab/debian/patches/07_add_place_menu.patch.old (from rev 287, packages/unstable/slab/debian/patches/new07_add_place_menu.patch)
Added: packages/unstable/slab/debian/patches/08_add_place_menu.patch
===================================================================
--- packages/unstable/slab/debian/patches/08_add_place_menu.patch 2006-08-26 10:17:01 UTC (rev 288)
+++ packages/unstable/slab/debian/patches/08_add_place_menu.patch 2006-08-26 11:33:25 UTC (rev 289)
@@ -0,0 +1,127 @@
+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
+@@ -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"
+ #define ITEM_LIMIT_GCONF_KEY FILE_AREA_GCONF_DIR "/item_limit"
++#define PLACES_GCONF_KEY FILE_AREA_GCONF_DIR "/places"
+ #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"
+
+ 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);
+
+@@ -204,6 +205,34 @@
+ tiles = get_tiles (this, i);
+
+ 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 @@
+ 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);
+
+@@ -754,6 +808,12 @@
+ }
+
+ static void
++place_gconf_notify_cb (GConfClient * client, guint conn_id,
++ GConfEntry * entry, gpointer user_data)
++{
++ 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 ../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;
Deleted: packages/unstable/slab/debian/patches/new02_remove_recent_app_menu.patch
===================================================================
--- packages/unstable/slab/debian/patches/new02_remove_recent_app_menu.patch 2006-08-26 10:17:01 UTC (rev 288)
+++ packages/unstable/slab/debian/patches/new02_remove_recent_app_menu.patch 2006-08-26 11:33:25 UTC (rev 289)
@@ -1,133 +0,0 @@
-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-25 23:02:35.000000000 +0200
-@@ -93,24 +93,25 @@
- static void tile_activated_cb (Tile *, TileEvent *, gpointer);
- static void tile_action_triggered_cb (Tile *, TileEvent *, TileAction *,
- gpointer);
--
-+/*
- static void recent_apps_store_monitor_cb (GnomeVFSMonitorHandle *,
- const gchar *, const gchar *,
- GnomeVFSMonitorEventType,
- gpointer);
-- static void recent_files_store_monitor_cb (GnomeVFSMonitorHandle *,
-+*/
-+ static void recent_files_store_monitor_cb (GnomeVFSMonitorHandle *,
- const gchar *, const gchar *,
- GnomeVFSMonitorEventType,
- gpointer);
--
-- static void tile_table_update_cb (TileTable *, TileTableUpdateEvent *,
-+
-+ 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 user_spec_apps_gconf_notify_cb (GConfClient *, guint,
-+
-+ static void user_spec_apps_gconf_notify_cb (GConfClient *, guint,
- GConfEntry *, gpointer);
-
- GtkWidget *file_area_widget_new (MainMenuUI * ui,
-@@ -126,8 +127,7 @@
- GtkTreeIter iter_cur;
-
- GtkTreeIter iter;
-- gint page_id;
--
-+ gint page_id;
- GList *showable_types_list;
- gboolean showable [FILE_CLASS_SENTINEL];
-
-@@ -232,25 +232,32 @@
- break;
-
- case RECENTLY_USED_APPS:
-- markup = _("Recently Used Applications");
-+/* markup = _("Recently Used Applications"); */
-+ markup = _("Places");
-
-- filename =
-+/* filename =
- g_build_filename (g_get_home_dir (),
- RECENT_APPS_FILE_PATH,
- NULL);
-+*/
-
-- uri = gnome_vfs_get_uri_from_local_path
-+/* uri = gnome_vfs_get_uri_from_local_path
- (filename);
-+*/
-
-- gnome_vfs_monitor_add (&handle,
-+/* gnome_vfs_monitor_add (&handle,
- uri,
- GNOME_VFS_MONITOR_FILE,
- recent_apps_store_monitor_cb,
- this);
-+*/
-
-+/*
- g_free (filename);
- g_free (uri);
-- break;
-+*/
-+
-+ break;
-
- case RECENT_FILES:
- markup = _("Recent Documents");
-@@ -515,10 +522,9 @@
- }
-
- else if (file_class == RECENTLY_USED_APPS) {
-- files = get_recent_files (RECENT_APPS_FILE_PATH);
--
-+/* files = get_recent_files (RECENT_APPS_FILE_PATH); */
- for (node = files; node; node = node->next) {
-- desktop_item_url =
-+/* desktop_item_url =
- egg_recent_item_get_uri ((EggRecentItem *)
- node->data);
-
-@@ -541,13 +547,16 @@
- tile = NULL;
- }
- }
-+*/
-
-- if (tile)
-+/* if (tile)
- tiles = g_list_append (tiles, tile);
-- }
--
-+*/
-+/*
- g_free (desktop_item_url);
- egg_recent_item_unref (node->data);
-+*/
-+
- }
- }
-
-@@ -742,7 +751,7 @@
- )
- main_menu_ui_close (priv->ui, FALSE);
- }
--
-+/*
- static void
- recent_apps_store_monitor_cb (GnomeVFSMonitorHandle * handle,
- const gchar * monitor_uri,
-@@ -752,6 +761,7 @@
- {
- update_table (FILE_AREA_WIDGET (user_data), RECENTLY_USED_APPS);
- }
-+*/
-
- static void
- recent_files_store_monitor_cb (GnomeVFSMonitorHandle * handle,
Deleted: packages/unstable/slab/debian/patches/new07_add_place_menu.patch
===================================================================
--- packages/unstable/slab/debian/patches/new07_add_place_menu.patch 2006-08-26 10:17:01 UTC (rev 288)
+++ packages/unstable/slab/debian/patches/new07_add_place_menu.patch 2006-08-26 11:33:25 UTC (rev 289)
@@ -1,150 +0,0 @@
-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.fixed/main-menu/src/file-area-widget.c slab-0.0.cvs.20060705/main-menu/src/file-area-widget.c
---- slab-0.0.cvs.20060705.fixed/main-menu/src/file-area-widget.c 2006-08-25 23:02:35.000000000 +0200
-+++ slab-0.0.cvs.20060705/main-menu/src/file-area-widget.c 2006-08-25 23:46:19.000000000 +0200
-@@ -47,8 +47,8 @@
- #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"
-+#define PLACES_GCONF_KEY FILE_AREA_GCONF_DIR "/places"
-
- G_DEFINE_TYPE (FileAreaWidget, file_area_widget, GTK_TYPE_VBOX)
-
-@@ -99,7 +99,10 @@
- GnomeVFSMonitorEventType,
- gpointer);
- */
-- static void recent_files_store_monitor_cb (GnomeVFSMonitorHandle *,
-+ static void places_gconf_notify_cb (GConfClient *, guint,
-+ GConfEntry *, gpointer);
-+
-+ static void recent_files_store_monitor_cb (GnomeVFSMonitorHandle *,
- const gchar *, const gchar *,
- GnomeVFSMonitorEventType,
- gpointer);
-@@ -240,10 +243,19 @@
- RECENT_APPS_FILE_PATH,
- NULL);
- */
-+ connect_gconf_notify
-+ (PLACES_GCONF_KEY,
-+ places_gconf_notify_cb,
-+ this);
-
- /* uri = gnome_vfs_get_uri_from_local_path
- (filename);
- */
-+ g_signal_connect (G_OBJECT (table),
-+ "tile-table-update",
-+ G_CALLBACK
-+ (tile_table_update_cb),
-+ this);
-
- /* gnome_vfs_monitor_add (&handle,
- uri,
-@@ -251,11 +263,21 @@
- recent_apps_store_monitor_cb,
- this);
- */
--
-+ g_signal_connect (G_OBJECT (table),
-+ "tile-table-uri-added",
-+ G_CALLBACK
-+ (tile_table_uri_added_cb),
-+ this);
-+
- /*
- g_free (filename);
- g_free (uri);
- */
-+ g_signal_connect (G_OBJECT (table),
-+ "notify::n-rows",
-+ G_CALLBACK
-+ (tile_table_n_rows_notify_cb),
-+ this);
-
- break;
-
-@@ -523,6 +545,7 @@
-
- else if (file_class == RECENTLY_USED_APPS) {
- /* files = get_recent_files (RECENT_APPS_FILE_PATH); */
-+ files = get_gconf_value (PLACES_GCONF_KEY);
- for (node = files; node; node = node->next) {
- /* desktop_item_url =
- egg_recent_item_get_uri ((EggRecentItem *)
-@@ -548,15 +571,33 @@
- }
- }
- */
-+ if (disable_term) {
-+ item = application_tile_get_desktop_item
-+ (APPLICATION_TILE (tile));
-+ categories =
-+ gnome_desktop_item_get_string (item,
-+ GNOME_DESKTOP_ITEM_CATEGORIES);
-
-+ }
- /* if (tile)
- tiles = g_list_append (tiles, tile);
- */
-+ if (strstr
-+ (categories,
-+ DESKTOP_ITEM_TERMINAL_EMULATOR_FLAG)) {
-+ gtk_widget_destroy (tile);
-+ tile = NULL;
-+ }
-+
- /*
- g_free (desktop_item_url);
- egg_recent_item_unref (node->data);
- */
--
-+ if (tile)
-+ tiles = g_list_append (tiles, tile);
-+
-+ g_free (node->data);
-+
- }
- }
-
-@@ -764,6 +805,14 @@
- */
-
- static void
-+places_gconf_notify_cb (GConfClient * client, guint conn_id,
-+ GConfEntry * entry, gpointer user_data)
-+{
-+ update_table (FILE_AREA_WIDGET (user_data), RECENTLY_USED_APPS);
-+}
-+
-+
-+static void
- recent_files_store_monitor_cb (GnomeVFSMonitorHandle * handle,
- const gchar * monitor_uri,
- const gchar * info_uri,
Modified: packages/unstable/slab/debian/patches/series
===================================================================
--- packages/unstable/slab/debian/patches/series 2006-08-26 10:17:01 UTC (rev 288)
+++ packages/unstable/slab/debian/patches/series 2006-08-26 11:33:25 UTC (rev 289)
@@ -1,6 +1,6 @@
01_fix_menu_path.patch
-02_fix_recent_app_menu.patch
03_fix_upgrade_packages.patch
04_link_statically.patch
05_binary_locations
06_fix_applet_conf_file.patch
+08_add_place_menu.patch
More information about the Pkg-galago-commit
mailing list