[Pkg-galago-commit] r276 - packages/unstable/slab/debian/patches
Riccardo Setti
giskard-guest at costa.debian.org
Thu Aug 24 17:51:37 UTC 2006
Author: giskard-guest
Date: 2006-08-24 17:51:36 +0000 (Thu, 24 Aug 2006)
New Revision: 276
Modified:
packages/unstable/slab/debian/patches/01_fix_menu_path.patch
Log:
fixed 01.patch
Modified: packages/unstable/slab/debian/patches/01_fix_menu_path.patch
===================================================================
--- packages/unstable/slab/debian/patches/01_fix_menu_path.patch 2006-08-24 17:45:39 UTC (rev 275)
+++ packages/unstable/slab/debian/patches/01_fix_menu_path.patch 2006-08-24 17:51:36 UTC (rev 276)
@@ -22,217 +22,3 @@
CONTROL_CENTER_PREFIX,
GTK_ICON_SIZE_DIALOG);
generate_categories (app_data);
-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_i
- 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,
More information about the Pkg-galago-commit
mailing list