diff options
Diffstat (limited to 'libnautilus-private')
| -rw-r--r-- | libnautilus-private/nautilus-file-utilities.c | 35 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-file-utilities.h | 11 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-icon-canvas-item.c | 9 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-thumbnails.c | 9 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-ui-utilities.c | 47 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-ui-utilities.h | 3 |
6 files changed, 9 insertions, 105 deletions
diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c index 6e5e28ca3..fda12293e 100644 --- a/libnautilus-private/nautilus-file-utilities.c +++ b/libnautilus-private/nautilus-file-utilities.c @@ -726,41 +726,6 @@ nautilus_get_gmc_desktop_directory (void) return g_build_filename (g_get_home_dir (), LEGACY_DESKTOP_DIRECTORY_NAME, NULL); } -/** - * nautilus_get_pixmap_directory - * - * Get the path for the directory containing Nautilus pixmaps. - * - * Return value: the directory path. - **/ -char * -nautilus_get_pixmap_directory (void) -{ - return g_strdup (DATADIR "/pixmaps/nautilus"); -} - -/* FIXME bugzilla.gnome.org 42423: - * Callers just use this and dereference so we core dump if - * pixmaps are missing. That is lame. - */ -char * -nautilus_pixmap_file (const char *partial_path) -{ - char *path; - - path = g_build_filename (DATADIR "/pixmaps/nautilus", partial_path, NULL); - if (g_file_test (path, G_FILE_TEST_EXISTS)) { - return path; - } else { - char *tmp; - tmp = nautilus_get_pixmap_directory (); - g_debug ("Failed to locate \"%s\" in Nautilus pixmap path \"%s\". Incomplete installation?", partial_path, tmp); - g_free (tmp); - } - g_free (path); - return NULL; -} - char * nautilus_get_data_file_path (const char *partial_path) { diff --git a/libnautilus-private/nautilus-file-utilities.h b/libnautilus-private/nautilus-file-utilities.h index e1c68cd79..87afe6126 100644 --- a/libnautilus-private/nautilus-file-utilities.h +++ b/libnautilus-private/nautilus-file-utilities.h @@ -49,7 +49,6 @@ gboolean nautilus_is_home_directory_file (GFile *dir, const char *filename); gboolean nautilus_is_in_system_dir (GFile *location); char * nautilus_get_gmc_desktop_directory (void); -char * nautilus_get_pixmap_directory (void); gboolean nautilus_should_use_templates_directory (void); char * nautilus_get_templates_directory (void); @@ -64,16 +63,6 @@ char * nautilus_compute_title_for_location (GFile *file); * is not NULL, but is not garaunteed to exist */ char * nautilus_get_desktop_directory_uri_no_create (void); -/* A version of gnome's gnome_pixmap_file that works for the nautilus prefix. - * Otherwise similar to gnome_pixmap_file in that it checks to see if the file - * exists and returns NULL if it doesn't. - */ -/* FIXME bugzilla.gnome.org 42425: - * We might not need this once we get on gnome-libs 2.0 which handles - * gnome_pixmap_file better, using GNOME_PATH. - */ -char * nautilus_pixmap_file (const char *partial_path); - /* Locate a file in either the uers directory or the datadir. */ char * nautilus_get_data_file_path (const char *partial_path); diff --git a/libnautilus-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c index 644598137..4bff34fd0 100644 --- a/libnautilus-private/nautilus-icon-canvas-item.c +++ b/libnautilus-private/nautilus-icon-canvas-item.c @@ -1233,15 +1233,16 @@ static GdkPixbuf * get_knob_pixbuf (void) { GdkPixbuf *knob_pixbuf; - char *knob_filename; knob_pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), "stock-nautilus-knob", 8, 0, NULL); if (!knob_pixbuf) { - knob_filename = nautilus_pixmap_file ("knob.png"); - knob_pixbuf = gdk_pixbuf_new_from_file (knob_filename, NULL); - g_free (knob_filename); + GInputStream *stream = g_resources_open_stream ("/org/gnome/nautilus/icons/knob.png", 0, NULL); + if (stream != NULL) { + knob_pixbuf = gdk_pixbuf_new_from_stream (stream, NULL, NULL); + g_object_unref (stream); + } } return knob_pixbuf; diff --git a/libnautilus-private/nautilus-thumbnails.c b/libnautilus-private/nautilus-thumbnails.c index c61200fce..a09470195 100644 --- a/libnautilus-private/nautilus-thumbnails.c +++ b/libnautilus-private/nautilus-thumbnails.c @@ -240,15 +240,14 @@ nautilus_remove_thumbnail_for_file (const char *file_uri) static GdkPixbuf * nautilus_get_thumbnail_frame (void) { - char *image_path; static GdkPixbuf *thumbnail_frame = NULL; if (thumbnail_frame == NULL) { - image_path = nautilus_pixmap_file ("thumbnail_frame.png"); - if (image_path != NULL) { - thumbnail_frame = gdk_pixbuf_new_from_file (image_path, NULL); + GInputStream *stream = g_resources_open_stream ("/org/gnome/nautilus/icons/thumbnail_frame.png", 0, NULL); + if (stream != NULL) { + thumbnail_frame = gdk_pixbuf_new_from_stream (stream, NULL, NULL); + g_object_unref (stream); } - g_free (image_path); } return thumbnail_frame; diff --git a/libnautilus-private/nautilus-ui-utilities.c b/libnautilus-private/nautilus-ui-utilities.c index 1c547d3ed..5403e7f1a 100644 --- a/libnautilus-private/nautilus-ui-utilities.c +++ b/libnautilus-private/nautilus-ui-utilities.c @@ -60,53 +60,6 @@ nautilus_ui_prepare_merge_ui (GtkUIManager *ui_manager, g_object_unref (*action_group); /* owned by ui manager */ } - -char * -nautilus_get_ui_directory (void) -{ - return g_strdup (DATADIR "/nautilus/ui"); -} - -char * -nautilus_ui_file (const char *partial_path) -{ - char *path; - - path = g_build_filename (DATADIR "/nautilus/ui", partial_path, NULL); - if (g_file_test (path, G_FILE_TEST_EXISTS)) { - return path; - } - g_free (path); - return NULL; -} - -const char * -nautilus_ui_string_get (const char *filename) -{ - static GHashTable *ui_cache = NULL; - char *ui; - char *path; - - if (ui_cache == NULL) { - ui_cache = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); - eel_debug_call_at_shutdown_with_data ((GFreeFunc)g_hash_table_destroy, ui_cache); - } - - ui = g_hash_table_lookup (ui_cache, filename); - if (ui == NULL) { - path = nautilus_ui_file (filename); - if (path == NULL || !g_file_get_contents (path, &ui, NULL, NULL)) { - g_warning ("Unable to load ui file %s\n", filename); - } - g_free (path); - g_hash_table_insert (ui_cache, - g_strdup (filename), - ui); - } - - return ui; -} - static void extension_action_callback (GtkAction *action, gpointer callback_data) diff --git a/libnautilus-private/nautilus-ui-utilities.h b/libnautilus-private/nautilus-ui-utilities.h index c22c3a0b6..bbb6dde41 100644 --- a/libnautilus-private/nautilus-ui-utilities.h +++ b/libnautilus-private/nautilus-ui-utilities.h @@ -27,8 +27,6 @@ #include <gtk/gtk.h> #include <libnautilus-extension/nautilus-menu-item.h> -char * nautilus_get_ui_directory (void); -char * nautilus_ui_file (const char *partial_path); void nautilus_ui_unmerge_ui (GtkUIManager *ui_manager, guint *merge_id, GtkActionGroup **action_group); @@ -37,7 +35,6 @@ void nautilus_ui_prepare_merge_ui (GtkUIManager *ui_manage guint *merge_id, GtkActionGroup **action_group); GtkAction * nautilus_action_from_menu_item (NautilusMenuItem *item); -const char *nautilus_ui_string_get (const char *filename); gboolean nautilus_event_should_open_in_new_tab (void); |