Remove. Remove nautilus-help.desktop since Nautilus isn't the help browser

	* .cvsignore:
	* Makefile.am:
	* nautilus-help.desktop.in: Remove.
	Remove nautilus-help.desktop since Nautilus isn't the help browser
	any more.

	* components/adapter/nautilus-adapter-load-strategy.c:
	(nautilus_adapter_load_strategy_class_init):
	* components/news/nautilus-news.c: (set_up_main_widgets):
	* libnautilus-private/nautilus-bookmark.c:
	(nautilus_bookmark_class_init):
	* libnautilus-private/nautilus-volume-monitor.c:
	(nautilus_volume_monitor_class_init):
	* src/file-manager/fm-desktop-icon-view.c:
	(fm_desktop_icon_view_destroy),
	(fm_desktop_icon_view_handle_middle_click), (delayed_init),
	(fm_desktop_icon_view_init), (desktop_icons_compare_callback):
	* src/nautilus-sidebar.c: (nautilus_sidebar_finalize),
	(nautilus_sidebar_update_buttons), (nautilus_sidebar_set_uri):
	Use more g_signal, less gtk_signal stuff.

	* components/hardware/nautilus-hardware-view.c: (setup_form_title),
	(setup_overview_form), (setup_CPU_form), (setup_RAM_form),
	(setup_IDE_form):
	* components/news/nautilus-news.c: (set_up_main_widgets):
	* src/file-manager/nautilus-indexing-info.c:
	(update_progress_display), (last_index_time_dialog_new),
	(index_progress_dialog_new):
	* src/nautilus-property-browser.c:
	(nautilus_property_browser_init), (element_clicked_callback),
	(labeled_image_new), (make_properties_from_directories),
	(add_reset_property), (make_properties_from_xml_node):
	* src/nautilus-sidebar-title.c: (nautilus_sidebar_title_init),
	(nautilus_sidebar_title_select_text_color), (update_title_font),
	(update_title), (update_more_info),
	(sidebar_title_create_title_label),
	(sidebar_title_create_more_info_label):
	Port more code from EelLabel to GtkLabel. Also change all code that
	was using things like "make_larger" to use "set_scale" now.

	* components/music/nautilus-music-view.c: (xpm_label_box),
	(xpm_dual_label_box), (nautilus_music_view_set_album_image):
	* libnautilus-private/nautilus-bookmark.c:
	(create_image_widget_for_bookmark),
	(nautilus_bookmark_menu_item_new):
	* src/nautilus-complex-search-bar.c:
	(load_find_them_pixmap_widget):
	Port more code from GtkPixmap to GtkImage.

	* components/notes/nautilus-notes.c:
	* components/throbber/nautilus-throbber.c:
	* src/file-manager/fm-properties-window.c:
	* src/nautilus-zoom-control.c:
	Remove extra includes.

	* libnautilus-private/nautilus-icon-factory.c:
	* libnautilus-private/nautilus-icon-factory.h:
	Remove nautilus_icon_factory_get_pixmap_and_mask_for_file.

	* src/nautilus-about.c: (draw_aa_string), (draw_author_list),
	(nautilus_about_draw_info): Port to use Pango to draw the text. It
	looks really bad right now, but should be straightforward to fix.

1 files changed, 11 insertions, 19 deletions

diff --git a/components/music/nautilus-music-view.c b/components/music/nautilus-music-view.c
index c15801923..df1e13561 100644
--- a/components/music/nautilus-music-view.c
+++ b/components/music/nautilus-music-view.c
@@ -1395,8 +1395,6 @@ static GtkWidget *
 xpm_label_box (NautilusMusicView *music_view, char * xpm_data[])
 {
         GdkPixbuf *pixbuf;
-        GdkPixmap *pixmap;
-        GdkBitmap *mask;
         GtkWidget *pix_widget;
         GtkWidget *box;
         GtkStyle *style;
@@ -1406,12 +1404,13 @@ xpm_label_box (NautilusMusicView *music_view, char * xpm_data[])
         style = gtk_widget_get_style (GTK_WIDGET (music_view->details->event_box));
 
         pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **)xpm_data);
-        gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &mask, GDK_PIXBUF_ALPHA_FULL);
 
-        pix_widget = gtk_pixmap_new (pixmap, mask);
+        pix_widget = gtk_image_new_from_pixbuf (pixbuf);
         gtk_box_pack_start (GTK_BOX (box), pix_widget, TRUE, FALSE, 3);
         gtk_widget_show (pix_widget);
 
+        g_object_unref (pixbuf);
+
         return box;
 }
 
@@ -1424,8 +1423,6 @@ xpm_dual_label_box (NautilusMusicView *music_view, char * xpm_data[],
 {
         GtkWidget *box;
         GtkStyle *style;
-        GdkPixmap *pixmap;
-        GdkBitmap *mask;
         GdkPixbuf *pixbuf;
 
 
@@ -1436,18 +1433,16 @@ xpm_dual_label_box (NautilusMusicView *music_view, char * xpm_data[],
 
         /* create the main pixwidget */
         pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **)xpm_data);
-        gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &mask, GDK_PIXBUF_ALPHA_FULL);
-
-        *main_pixwidget = gtk_pixmap_new (pixmap, mask);
+        *main_pixwidget = gtk_image_new_from_pixbuf (pixbuf);
+        g_object_unref (pixbuf);
 
         gtk_box_pack_start (GTK_BOX (box), *main_pixwidget, TRUE, FALSE, 3);
         gtk_widget_show (*main_pixwidget);
 
         /* create the alternative pixwidget */
         pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **)alt_xpm_data);
-        gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &mask, GDK_PIXBUF_ALPHA_FULL);
-
-        *alt_pixwidget = gtk_pixmap_new (pixmap, mask);
+        *alt_pixwidget = gtk_image_new_from_pixbuf (pixbuf);
+        g_object_unref (pixbuf);
 
         gtk_box_pack_start (GTK_BOX (box), *alt_pixwidget, TRUE, FALSE, 3);
         gtk_widget_hide (*alt_pixwidget);
@@ -1602,8 +1597,6 @@ nautilus_music_view_set_album_image (NautilusMusicView *music_view, const char *
 	char* image_path;
 	GdkPixbuf *pixbuf;
 	GdkPixbuf *scaled_pixbuf;
-	GdkPixmap *pixmap;
-	GdkBitmap *mask;	
 
 	if (image_path_uri != NULL) {
   		image_path = gnome_vfs_get_local_path_from_uri (image_path_uri);  		
@@ -1613,16 +1606,15 @@ nautilus_music_view_set_album_image (NautilusMusicView *music_view, const char *
 			scaled_pixbuf = eel_gdk_pixbuf_scale_down_to_fit (pixbuf, SCALED_IMAGE_WIDTH, SCALED_IMAGE_HEIGHT);
 			g_object_unref (pixbuf);
 
-       			gdk_pixbuf_render_pixmap_and_mask (scaled_pixbuf, &pixmap, &mask, EEL_STANDARD_ALPHA_THRESHHOLD);
-			g_object_unref (scaled_pixbuf);
-			
 			if (music_view->details->album_image == NULL) {
-				music_view->details->album_image = gtk_pixmap_new (pixmap, mask);
+				music_view->details->album_image = gtk_image_new_from_pixbuf (scaled_pixbuf);
 				gtk_box_pack_start (GTK_BOX (music_view->details->image_box), 
                                                     music_view->details->album_image, FALSE, FALSE, 2);	
 			} else {
-				gtk_pixmap_set (GTK_PIXMAP (music_view->details->album_image), pixmap, mask);
+				gtk_image_set_from_pixbuf (GTK_IMAGE (music_view->details->album_image), scaled_pixbuf);
 			}
+
+                        g_object_unref (scaled_pixbuf);
 		
 			gtk_widget_show (music_view->details->album_image);