Commit abf488d6 authored by Darin Adler's avatar Darin Adler

Fix typo that caused us to unref a NULL GdkBitmap.

	* libnautilus-extensions/nautilus-drag.c:
	(nautilus_drag_finalize): Fix typo that caused us to unref a NULL
	GdkBitmap.

	* libnautilus-extensions/nautilus-icon-dnd.c:
	(nautilus_icon_dnd_fini): Fix double-free that caused everything
	to go haywire.

	* src/file-manager/fm-directory-view.c:
	(add_component_to_gtk_menu), (add_component_to_bonobo_menu):
	Marked a couple of strings for localization that were missed.
parent a51a8ee5
2000-06-02 Darin Adler <darin@eazel.com>
* libnautilus-extensions/nautilus-drag.c:
(nautilus_drag_finalize): Fix typo that caused us to unref a NULL
GdkBitmap.
* libnautilus-extensions/nautilus-icon-dnd.c:
(nautilus_icon_dnd_fini): Fix double-free that caused everything
to go haywire.
* src/file-manager/fm-directory-view.c:
(add_component_to_gtk_menu), (add_component_to_bonobo_menu):
Marked a couple of strings for localization that were missed.
2000-06-02 Darin Adler <darin@eazel.com>
* components/services/install/idl/.cvsignore:
......@@ -38,7 +52,7 @@
2000-06-02 Ramiro Estrugo <ramiro@eazel.com>
Task 518. Support for changing preferecens individually
Task 518. Support for changing preferences individually
within each confgurable user level.
* libnautilus-extensions/nautilus-global-preferences.h:
......
......@@ -34,13 +34,13 @@
void
nautilus_drag_init (NautilusDragInfo *drag_info,
const GtkTargetEntry *drag_types, int drag_type_count,
GdkBitmap *stipple)
const GtkTargetEntry *drag_types, int drag_type_count,
GdkBitmap *stipple)
{
drag_info->target_list = gtk_target_list_new (drag_types,
drag_type_count);
if (stipple) {
if (stipple != NULL) {
drag_info->stipple = gdk_bitmap_ref (stipple);
}
}
......@@ -51,7 +51,7 @@ nautilus_drag_finalize (NautilusDragInfo *drag_info)
gtk_target_list_unref (drag_info->target_list);
nautilus_drag_destroy_selection_list (drag_info->selection_list);
if (drag_info != NULL) {
if (drag_info->stipple != NULL) {
gdk_bitmap_unref (drag_info->stipple);
}
......
......@@ -864,7 +864,6 @@ nautilus_icon_dnd_fini (NautilusIconContainer *container)
gtk_object_destroy (GTK_OBJECT (container->details->dnd_info->shadow));
nautilus_drag_finalize (&container->details->dnd_info->drag_info);
g_free (container->details->dnd_info);
}
......
......@@ -34,13 +34,13 @@
void
nautilus_drag_init (NautilusDragInfo *drag_info,
const GtkTargetEntry *drag_types, int drag_type_count,
GdkBitmap *stipple)
const GtkTargetEntry *drag_types, int drag_type_count,
GdkBitmap *stipple)
{
drag_info->target_list = gtk_target_list_new (drag_types,
drag_type_count);
if (stipple) {
if (stipple != NULL) {
drag_info->stipple = gdk_bitmap_ref (stipple);
}
}
......@@ -51,7 +51,7 @@ nautilus_drag_finalize (NautilusDragInfo *drag_info)
gtk_target_list_unref (drag_info->target_list);
nautilus_drag_destroy_selection_list (drag_info->selection_list);
if (drag_info != NULL) {
if (drag_info->stipple != NULL) {
gdk_bitmap_unref (drag_info->stipple);
}
......
......@@ -864,7 +864,6 @@ nautilus_icon_dnd_fini (NautilusIconContainer *container)
gtk_object_destroy (GTK_OBJECT (container->details->dnd_info->shadow));
nautilus_drag_finalize (&container->details->dnd_info->drag_info);
g_free (container->details->dnd_info);
}
......
......@@ -1948,7 +1948,7 @@ add_component_to_gtk_menu (GtkMenu *menu,
identifier = nautilus_view_identifier_new_from_content_view (component);
label = g_strdup_printf ("%s Viewer", identifier->name);
label = g_strdup_printf (_("%s Viewer"), identifier->name);
menu_item = gtk_menu_item_new_with_label (label);
g_free (label);
......@@ -2204,9 +2204,10 @@ add_component_to_bonobo_menu (BonoboUIHandler *ui_handler,
launch_parameters = g_new0 (ViewerLaunchParameters, 1);
launch_parameters->identifier =
nautilus_view_identifier_new_from_content_view (component);
launch_parameters->file_uri = g_strdup (uri);
launch_parameters->file_uri = g_strdup (uri);
label = g_strdup_printf ("%s Viewer", launch_parameters->identifier->name);
label = g_strdup_printf (_("%s Viewer"),
launch_parameters->identifier->name);
add_open_with_bonobo_menu_item (ui_handler,
label,
bonobo_open_location_with_viewer_callback,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment