Commit 2bab818c authored by Darin Adler's avatar Darin Adler

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.
parent b790895f
......@@ -21,7 +21,6 @@ libtool
ltconfig
ltmain.sh
nautilus-*.tar.gz
nautilus-help.desktop
nautilus.desktop
nautilus.spec
obj
......
2002-01-08 Darin Adler <darin@bentspoon.com>
* .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.
2002-01-08 Anders Carlsson <andersca@gnu.org>
* libnautilus-private/nautilus-bonobo-extensions.c (activation_handle_free):
......
......@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.shared
@INTLTOOL_DESKTOP_RULE@
DESKTOP_IN_FILES=nautilus.desktop.in nautilus-help.desktop.in
DESKTOP_IN_FILES=nautilus.desktop.in
DESKTOP_FILES=$(DESKTOP_IN_FILES:.desktop.in=.desktop)
SUBDIRS = \
......@@ -30,8 +30,6 @@ EXTRA_DIST= \
nautilus.spec.in \
nautilus.desktop \
nautilus.desktop.in \
nautilus-help.desktop \
nautilus-help.desktop.in \
nautilus-launch-icon.png \
gnome-starthere-96.png \
gnome-starthere.png \
......
......@@ -83,7 +83,7 @@ nautilus_adapter_load_strategy_class_init (NautilusAdapterLoadStrategyClass *kla
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusAdapterLoadStrategyClass, report_load_underway),
NULL, NULL,
gtk_marshal_VOID__VOID,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
signals[REPORT_LOAD_PROGRESS] =
g_signal_new ("report_load_progress",
......@@ -99,7 +99,7 @@ nautilus_adapter_load_strategy_class_init (NautilusAdapterLoadStrategyClass *kla
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusAdapterLoadStrategyClass, report_load_complete),
NULL, NULL,
gtk_marshal_VOID__VOID,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
signals[REPORT_LOAD_FAILED] =
g_signal_new ("report_load_failed",
......@@ -107,7 +107,7 @@ nautilus_adapter_load_strategy_class_init (NautilusAdapterLoadStrategyClass *kla
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusAdapterLoadStrategyClass, report_load_failed),
NULL, NULL,
gtk_marshal_VOID__VOID,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
}
......
......@@ -454,8 +454,8 @@ setup_form_title (NautilusHardwareView *view,
}
}
temp_widget = eel_label_new (title_text);
eel_label_make_larger (EEL_LABEL (temp_widget), 10);
temp_widget = gtk_label_new (title_text);
eel_gtk_label_set_scale (GTK_LABEL (temp_widget), PANGO_SCALE_X_LARGE);
gtk_box_pack_start (GTK_BOX (temp_container), temp_widget, 0, 0, 8);
gtk_widget_show (temp_widget);
......@@ -536,8 +536,8 @@ setup_overview_form (NautilusHardwareView *view)
gtk_widget_show (temp_widget);
g_free (file_name);
temp_widget = eel_label_new (temp_text);
eel_label_make_larger (EEL_LABEL (temp_widget), 2);
temp_widget = gtk_label_new (temp_text);
eel_gtk_label_set_scale (GTK_LABEL (temp_widget), PANGO_SCALE_LARGE);
g_free(temp_text);
gtk_box_pack_start(GTK_BOX(temp_box), temp_widget, 0, 0, 0 );
gtk_widget_show (temp_widget);
......@@ -557,8 +557,8 @@ setup_overview_form (NautilusHardwareView *view)
g_free (file_name);
temp_text = get_RAM_description ();
temp_widget = eel_label_new (temp_text);
eel_label_make_larger (EEL_LABEL (temp_widget), 2);
temp_widget = gtk_label_new (temp_text);
eel_gtk_label_set_scale (GTK_LABEL (temp_widget), PANGO_SCALE_LARGE);
g_free (temp_text);
gtk_box_pack_start (GTK_BOX(temp_box), temp_widget, 0, 0, 0 );
gtk_widget_show (temp_widget);
......@@ -596,9 +596,9 @@ setup_overview_form (NautilusHardwareView *view)
g_free(ide_media);
temp_text = get_IDE_description (device);
temp_widget = eel_label_new (temp_text);
eel_label_make_larger (EEL_LABEL (temp_widget), 2);
eel_label_set_justify (EEL_LABEL (temp_widget), GTK_JUSTIFY_CENTER);
temp_widget = gtk_label_new (temp_text);
eel_gtk_label_set_scale (GTK_LABEL (temp_widget), PANGO_SCALE_LARGE);
gtk_label_set_justify (GTK_LABEL (temp_widget), GTK_JUSTIFY_CENTER);
g_free(temp_text);
gtk_box_pack_start(GTK_BOX(temp_box), temp_widget, 0, 0, 0);
......@@ -612,10 +612,7 @@ setup_overview_form (NautilusHardwareView *view)
/* allocate the uptime label */
view->details->uptime_label = GTK_LABEL (gtk_label_new (""));
#if GNOME2_CONVERSION_COMPLETE
eel_label_make_larger (view->details->uptime_label, 2);
eel_label_set_justify (view->details->uptime_label, GTK_JUSTIFY_LEFT);
#endif
eel_gtk_label_set_scale (view->details->uptime_label, PANGO_SCALE_LARGE);
gtk_box_pack_end (GTK_BOX (view->details->form), GTK_WIDGET (view->details->uptime_label), 0, 0, GNOME_PAD);
update_uptime_text (view);
......@@ -642,9 +639,9 @@ setup_CPU_form (NautilusHardwareView *view)
setup_form_title (view, NULL, "CPU");
message = _("This is a placeholder for the CPU page.");
temp_widget = eel_label_new (message);
eel_label_make_larger (EEL_LABEL (temp_widget), 2);
eel_label_set_wrap(EEL_LABEL(temp_widget), TRUE);
temp_widget = gtk_label_new (message);
eel_gtk_label_set_scale (GTK_LABEL (temp_widget), PANGO_SCALE_LARGE);
gtk_label_set_wrap (GTK_LABEL (temp_widget), TRUE);
gtk_box_pack_start(GTK_BOX(view->details->form), temp_widget, 0, 0, 12);
gtk_widget_show (temp_widget);
......@@ -667,9 +664,9 @@ setup_RAM_form (NautilusHardwareView *view)
setup_form_title (view, NULL, "RAM");
message = _("This is a placeholder for the RAM page.");
temp_widget = eel_label_new (message);
eel_label_make_larger (EEL_LABEL (temp_widget), 2);
eel_label_set_wrap(EEL_LABEL(temp_widget), TRUE);
temp_widget = gtk_label_new (message);
eel_gtk_label_set_scale (GTK_LABEL (temp_widget), PANGO_SCALE_LARGE);
gtk_label_set_wrap (GTK_LABEL (temp_widget), TRUE);
gtk_box_pack_start(GTK_BOX(view->details->form), temp_widget, 0, 0, 12);
gtk_widget_show (temp_widget);
......@@ -692,9 +689,9 @@ setup_IDE_form (NautilusHardwareView *view)
setup_form_title (view, NULL, "IDE");
message = _("This is a placeholder for the IDE page.");
temp_widget = eel_label_new (message);
eel_label_make_larger (EEL_LABEL (temp_widget), 2);
eel_label_set_wrap(EEL_LABEL(temp_widget), TRUE);
temp_widget = gtk_label_new (message);
eel_gtk_label_set_scale (GTK_LABEL (temp_widget), PANGO_SCALE_LARGE);
gtk_label_set_wrap (GTK_LABEL (temp_widget), TRUE);
gtk_box_pack_start(GTK_BOX(view->details->form), temp_widget, 0, 0, 12);
gtk_widget_show (temp_widget);
......
......@@ -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);
......
......@@ -31,6 +31,7 @@
#include <time.h>
#include <gtk/gtkcheckbutton.h>
#include <gtk/gtkclist.h>
#include <gtk/gtkdrawingarea.h>
#include <gtk/gtkframe.h>
#include <gtk/gtkhbbox.h>
......@@ -2414,27 +2415,24 @@ set_up_main_widgets (News *news, GtkWidget *container)
/* add the empty message */
news->empty_message = gtk_label_new (_("The News panel displays current headlines from your favorite websites. Click the \'Select Sites\' button to select the sites to display."));
#if GNOME2_CONVERSION_COMPLETE
eel_label_set_smooth_font_size (EEL_LABEL (news->empty_message), 14);
eel_label_set_justify (EEL_LABEL (news->empty_message), GTK_JUSTIFY_LEFT);
eel_label_set_wrap (EEL_LABEL (news->empty_message), TRUE);
#endif
eel_gtk_label_set_scale (GTK_LABEL (news->empty_message), PANGO_SCALE_LARGE);
gtk_label_set_line_wrap (GTK_LABEL (news->empty_message), TRUE);
gtk_box_pack_start (GTK_BOX (news->main_box), news->empty_message, TRUE,
TRUE, 0);
TRUE, 0);
/* connect the appropriate signals for drawing and event handling */
g_signal_connect (news->news_display, "expose_event",
(GtkSignalFunc) nautilus_news_expose_event, news);
gtk_signal_connect (GTK_OBJECT(news->news_display),"configure_event",
(GtkSignalFunc) nautilus_news_configure_event, news);
G_CALLBACK (nautilus_news_expose_event), news);
g_signal_connect (news->news_display,"configure_event",
G_CALLBACK (nautilus_news_configure_event), news);
g_signal_connect (news->news_display, "motion_notify_event",
(GtkSignalFunc) nautilus_news_motion_notify_event, news);
G_CALLBACK (nautilus_news_motion_notify_event), news);
g_signal_connect (news->news_display, "leave_notify_event",
(GtkSignalFunc) nautilus_news_leave_notify_event, news);
G_CALLBACK (nautilus_news_leave_notify_event), news);
g_signal_connect (news->news_display, "button_release_event",
(GtkSignalFunc) nautilus_news_button_release_event, news);
G_CALLBACK (nautilus_news_button_release_event), news);
gtk_widget_set_events (news->news_display, GDK_EXPOSURE_MASK
| GDK_LEAVE_NOTIFY_MASK
......
......@@ -32,6 +32,7 @@
#include <eel/eel-gtk-extensions.h>
#include <eel/eel-string.h>
#include <gtk/gtkmain.h>
#include <gtk/gtksignal.h>
#include <gtk/gtktextbuffer.h>
#include <gtk/gtktextview.h>
#include <gtk/gtkvbox.h>
......
......@@ -38,7 +38,6 @@
#include <gtk/gtksignal.h>
#include <libgnome/gnome-macros.h>
#include <libgnome/gnome-util.h>
#include <libgnomeui/gnome-pixmap.h>
#include <libnautilus-private/nautilus-file-utilities.h>
#include <libnautilus-private/nautilus-global-preferences.h>
#include <libnautilus-private/nautilus-icon-factory.h>
......@@ -276,7 +275,6 @@ nautilus_throbber_instance_init (NautilusThrobber *throbber)
bonobo_property_bag_add (throbber->details->property_bag, "location", LOCATION, BONOBO_ARG_STRING, NULL,
"associated URL", 0);
/* allocate the pixmap that holds the image */
nautilus_throbber_load_images (throbber);
gtk_widget_show (widget);
......
......@@ -32,7 +32,9 @@
#include <eel/eel-string.h>
#include <eel/eel-vfs-extensions.h>
#include <gtk/gtkaccellabel.h>
#include <gtk/gtkimage.h>
#include <gtk/gtkimagemenuitem.h>
#include <gtk/gtksignal.h>
#include <libgnome/gnome-util.h>
#include <libgnomevfs/gnome-vfs-types.h>
#include <libgnomevfs/gnome-vfs-uri.h>
......@@ -61,7 +63,6 @@ static void nautilus_bookmark_connect_file (NautilusBookmark *file);
static void nautilus_bookmark_disconnect_file (NautilusBookmark *file);
static void nautilus_bookmark_class_init (NautilusBookmarkClass *class);
static void nautilus_bookmark_init (NautilusBookmark *bookmark);
static GtkWidget *create_pixmap_widget_for_bookmark (NautilusBookmark *bookmark);
EEL_CLASS_BOILERPLATE (NautilusBookmark, nautilus_bookmark, GTK_TYPE_OBJECT)
......@@ -103,7 +104,7 @@ nautilus_bookmark_class_init (NautilusBookmarkClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusBookmarkClass, appearance_changed),
NULL, NULL,
gtk_marshal_VOID__VOID,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
signals[CONTENTS_CHANGED] =
......@@ -112,7 +113,7 @@ nautilus_bookmark_class_init (NautilusBookmarkClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusBookmarkClass, contents_changed),
NULL, NULL,
gtk_marshal_VOID__VOID,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
}
......@@ -535,23 +536,24 @@ nautilus_bookmark_new_with_icon (const char *uri, const char *name,
}
static GtkWidget *
create_pixmap_widget_for_bookmark (NautilusBookmark *bookmark)
create_image_widget_for_bookmark (NautilusBookmark *bookmark)
{
GdkPixmap *gdk_pixmap;
GdkBitmap *mask;
GdkPixbuf *pixbuf;
GtkWidget *widget;
if (!nautilus_bookmark_get_pixmap_and_mask (bookmark,
NAUTILUS_ICON_SIZE_FOR_MENUS,
&gdk_pixmap,
&mask)) {
pixbuf = nautilus_bookmark_get_pixbuf (bookmark, NAUTILUS_ICON_SIZE_FOR_MENUS, FALSE);
if (pixbuf == NULL) {
return NULL;
}
return gtk_pixmap_new (gdk_pixmap, mask);
widget = gtk_image_new_from_pixbuf (pixbuf);
g_object_unref (pixbuf);
return widget;
}
/**
* nautilus_bookmarnuk_menu_item_new:
* nautilus_bookmark_menu_item_new:
*
* Return a menu item representing a bookmark.
* @bookmark: The bookmark the menu item represents.
......@@ -561,18 +563,17 @@ GtkWidget *
nautilus_bookmark_menu_item_new (NautilusBookmark *bookmark)
{
GtkWidget *menu_item;
GtkWidget *pixmap_widget;
GtkWidget *image_widget;
GtkWidget *label;
char *display_name;
menu_item = gtk_image_menu_item_new ();
pixmap_widget = create_pixmap_widget_for_bookmark (bookmark);
if (pixmap_widget != NULL) {
gtk_widget_show (pixmap_widget);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), \
pixmap_widget);
image_widget = create_image_widget_for_bookmark (bookmark);
if (image_widget != NULL) {
gtk_widget_show (image_widget);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
image_widget);
}
display_name = eel_truncate_text_for_menu_item (bookmark->details->name);
label = gtk_label_new (display_name);
......
......@@ -3747,7 +3747,6 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container,
GdkPixbuf *pixbuf, *emblem_pixbuf, *saved_pixbuf;
GList *emblem_scalable_icons, *emblem_pixbufs, *p;
char *editable_text, *additional_text;
GdkFont *font;
if (icon == NULL) {
return;
......@@ -3840,12 +3839,12 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container,
end_renaming_mode (container, FALSE);
}
font = details->label_font[details->zoom_level];
gnome_canvas_item_set (GNOME_CANVAS_ITEM (icon->item),
"editable_text", editable_text,
"additional_text", additional_text,
"font", font,
#if GNOME2_CONVERSION_COMPLETE
"font", details->label_font[details->zoom_level],
#endif
"highlighted_for_drop", icon == details->drop_target,
NULL);
......@@ -5002,12 +5001,12 @@ nautilus_icon_container_set_label_font_for_zoom_level (NautilusIconContainer *co
g_return_if_fail (zoom_level >= NAUTILUS_ZOOM_LEVEL_SMALLEST);
g_return_if_fail (zoom_level <= NAUTILUS_ZOOM_LEVEL_LARGEST);
gdk_font_ref (font);
if (container->details->label_font[zoom_level] != NULL) {
gdk_font_unref (container->details->label_font[zoom_level]);
}
gdk_font_ref (font);
container->details->label_font[zoom_level] = font;
}
......
......@@ -2152,33 +2152,6 @@ nautilus_icon_factory_get_pixbuf_for_file (NautilusFile *file,
return pixbuf;
}
/* Convenience cover for nautilus_icon_factory_get_icon_for_file,
* nautilus_icon_factory_get_pixbuf_for_icon,
* and gdk_pixbuf_render_pixmap_and_mask.
*/
void
nautilus_icon_factory_get_pixmap_and_mask_for_file (NautilusFile *file,
const char *modifer,
guint size_in_pixels,
GdkPixmap **pixmap,
GdkBitmap **mask)
{
GdkPixbuf *pixbuf;
g_return_if_fail (pixmap != NULL);
g_return_if_fail (mask != NULL);
*pixmap = NULL;
*mask = NULL;
pixbuf = nautilus_icon_factory_get_pixbuf_for_file (file, modifer, size_in_pixels, FALSE);
if (pixbuf == NULL) {
return;
}
gdk_pixbuf_render_pixmap_and_mask (pixbuf, pixmap, mask, EEL_STANDARD_ALPHA_THRESHHOLD);
g_object_unref (pixbuf);
}
/* Convenience routine for getting a pixbuf from an icon name. */
GdkPixbuf *
nautilus_icon_factory_get_pixbuf_from_name (const char *icon_name,
......
......@@ -140,14 +140,6 @@ GdkPixbuf * nautilus_icon_factory_get_pixbuf_for_file (Nautil
guint size_in_pixels,
gboolean optimized_for_anti_aliasing);
/* Convenience functions for legacy interfaces that require a pixmap and
* bitmap. Maybe we can get rid of these one day.
*/
void nautilus_icon_factory_get_pixmap_and_mask_for_file (NautilusFile *file,
const char *modifer,
guint size_in_pixels,
GdkPixmap **pixmap,
GdkBitmap **mask);
/* Convenience routine for getting a pixbuf from an icon name
*/
GdkPixbuf * nautilus_icon_factory_get_pixbuf_from_name (const char *icon_name,
......
......@@ -305,7 +305,7 @@ nautilus_volume_monitor_class_init (NautilusVolumeMonitorClass *klass)
G_STRUCT_OFFSET (NautilusVolumeMonitorClass,
volume_mounted),
NULL, NULL,
gtk_marshal_VOID__POINTER,
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_POINTER);
signals[VOLUME_UNMOUNT_STARTED]
......@@ -315,7 +315,7 @@ nautilus_volume_monitor_class_init (NautilusVolumeMonitorClass *klass)
G_STRUCT_OFFSET (NautilusVolumeMonitorClass,
volume_unmount_started),
NULL, NULL,
gtk_marshal_VOID__POINTER,
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_POINTER);
signals[VOLUME_UNMOUNT_FAILED]
......@@ -325,7 +325,7 @@ nautilus_volume_monitor_class_init (NautilusVolumeMonitorClass *klass)
G_STRUCT_OFFSET (NautilusVolumeMonitorClass,
volume_unmount_failed),
NULL, NULL,
gtk_marshal_VOID__POINTER,
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_POINTER);
signals[VOLUME_UNMOUNTED]
......@@ -335,7 +335,7 @@ nautilus_volume_monitor_class_init (NautilusVolumeMonitorClass *klass)
G_STRUCT_OFFSET (NautilusVolumeMonitorClass,
volume_unmounted),
NULL, NULL,
gtk_marshal_VOID__POINTER,
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_POINTER);
/* Check environment a bit. */
......
[Desktop Entry]
_Name=Help
_Comment=Documentation
Exec=nautilus --no-default-window --no-desktop ghelp:toc
Icon=gnome-help.png
Terminal=0
Type=Application
Categories=Application;Core;
......@@ -33,6 +33,7 @@
#include <dirent.h>
#include <eel/eel-glib-extensions.h>
#include <eel/eel-gnome-extensions.h>
#include <eel/eel-gobject-extensions.h>
#include <eel/eel-gtk-extensions.h>
#include <eel/eel-gtk-macros.h>
#include <eel/eel-stock-dialogs.h>
......@@ -83,8 +84,8 @@ struct FMDesktopIconViewDetails
/* For the desktop rescanning
*/
guint delayed_init_signal;
guint done_loading_signal;
gulong delayed_init_signal;
gulong done_loading_signal;
guint reload_desktop_timeout;
gboolean pending_rescan;
};
......@@ -236,14 +237,13 @@ fm_desktop_icon_view_destroy (GtkObject *object)
}
if (icon_view->details->done_loading_signal != 0) {
gtk_signal_disconnect (GTK_OBJECT (fm_directory_view_get_model
(FM_DIRECTORY_VIEW (icon_view))),
icon_view->details->done_loading_signal);
g_signal_handler_disconnect (fm_directory_view_get_model (FM_DIRECTORY_VIEW (icon_view)),
icon_view->details->done_loading_signal);
}
if (icon_view->details->delayed_init_signal != 0) {
gtk_signal_disconnect (GTK_OBJECT (icon_view),
icon_view->details->delayed_init_signal);
g_signal_handler_disconnect (icon_view,
icon_view->details->delayed_init_signal);
}
/* Delete all of the link files. */
......@@ -303,7 +303,7 @@ fm_desktop_icon_view_handle_middle_click (NautilusIconContainer *icon_container,
/* Stop the event because we don't want anyone else dealing with it. */
gdk_flush ();
gtk_signal_emit_stop_by_name (GTK_OBJECT(icon_container), "middle_click");
g_signal_stop_emission_by_name (icon_container, "middle_click");
/* build an X event to represent the middle click. */
x_event.type = ButtonPress;
......@@ -539,8 +539,8 @@ delayed_init (FMDesktopIconView *desktop_icon_view)
desktop_icon_view->details->reload_desktop_timeout =
gtk_timeout_add (RESCAN_TIMEOUT, do_desktop_rescan, desktop_icon_view);
gtk_signal_disconnect (GTK_OBJECT (desktop_icon_view),
desktop_icon_view->details->delayed_init_signal);
g_signal_handler_disconnect (desktop_icon_view,
desktop_icon_view->details->delayed_init_signal);
desktop_icon_view->details->delayed_init_signal = 0;
}
......@@ -569,8 +569,8 @@ fm_desktop_icon_view_init (FMDesktopIconView *desktop_icon_view)
* way to keep track of the items on the desktop.
*/
if (!nautilus_monitor_active ()) {
desktop_icon_view->details->delayed_init_signal = gtk_signal_connect
(GTK_OBJECT (desktop_icon_view), "begin_loading",
desktop_icon_view->details->delayed_init_signal = g_signal_connect
(desktop_icon_view, "begin_loading",
G_CALLBACK (delayed_init), desktop_icon_view);
}
......@@ -624,23 +624,23 @@ fm_desktop_icon_view_init (FMDesktopIconView *desktop_icon_view)
G_CALLBACK (event_callback),
desktop_icon_view);
gtk_signal_connect_while_alive (GTK_OBJECT (nautilus_trash_monitor_get ()),
eel_signal_connect_while_alive (G_OBJECT (nautilus_trash_monitor_get ()),
"trash_state_changed",
G_CALLBACK (fm_desktop_icon_view_trash_state_changed_callback),
desktop_icon_view,
GTK_OBJECT (desktop_icon_view));
G_OBJECT (desktop_icon_view));
gtk_signal_connect_while_alive (GTK_OBJECT (nautilus_volume_monitor_get ()),
eel_signal_connect_while_alive (G_OBJECT (nautilus_volume_monitor_get ()),
"volume_mounted",
G_CALLBACK (volume_mounted_callback),
desktop_icon_view,
GTK_OBJECT (desktop_icon_view));
G_OBJECT (desktop_icon_view));
gtk_signal_connect_while_alive (GTK_OBJECT (nautilus_volume_monitor_get ()),
eel_signal_connect_while_alive (G_OBJECT (nautilus_volume_monitor_get ()),
"volume_unmounted",
G_CALLBACK (volume_unmounted_callback),
desktop_icon_view,
GTK_OBJECT (desktop_icon_view));
G_OBJECT (desktop_icon_view));
eel_preferences_add_callback (NAUTILUS_PREFERENCES_HOME_URI,
home_uri_changed,
......@@ -1042,8 +1042,7 @@ desktop_icons_compare_callback (NautilusIconContainer *container,
/* We know the answer, so prevent the other handlers
* from overwriting our result.
*/
gtk_signal_emit_stop_by_name (GTK_OBJECT (container),
"compare_icons");
g_signal_stop_emission_by_name (container, "compare_icons");
if (category_a < category_b) {
return -1;
} else {
......
......@@ -39,6 +39,7 @@
#include <eel/eel-vfs-extensions.h>
#include <eel/eel-viewport.h>
#include <eel/eel-wrap-table.h>
#include <gtk/gtkalignment.h>
#include <gtk/gtkcheckbutton.h>
#include <gtk/gtkdnd.h>
#include <gtk/gtkentry.h>
......@@ -49,7 +50,6 @@
#include <gtk/gtkmain.h>
#include <gtk/gtknotebook.h>
#include <gtk/gtkoptionmenu.h>
#include <gtk/gtkpixmap.h>