From 0f2f0596b0f5e69d35ee712b2b3f12f08e95bc42 Mon Sep 17 00:00:00 2001 From: Denis Leroy Date: Dec 30 2007 11:18:04 +0000 Subject: Removed upstreamed tooltips patch --- diff --git a/brasero-0.6.0-tooltips.patch b/brasero-0.6.0-tooltips.patch deleted file mode 100644 index 633fe02..0000000 --- a/brasero-0.6.0-tooltips.patch +++ /dev/null @@ -1,623 +0,0 @@ ---- brasero-0.6.0/src/project-type-chooser.c~ 2007-07-11 14:48:14.000000000 +0200 -+++ brasero-0.6.0/src/project-type-chooser.c 2007-08-10 19:35:00.000000000 +0200 -@@ -36,7 +36,6 @@ - #include - #include - #include --#include - - #include "project-type-chooser.h" - #include "utils.h" -@@ -98,8 +97,6 @@ - GdkPixbuf *background; - GtkWidget *selected; - GtkWidget *hovered; -- -- GtkTooltips *tooltips; - }; - - static gboolean -@@ -208,10 +205,8 @@ - chooser); - - if (description->tooltip) { -- gtk_tooltips_set_tip (chooser->priv->tooltips, -- event, -- _(description->tooltip), -- NULL); -+ gtk_widget_set_tooltip_text (event, -+ _(description->tooltip)); - } - - eventbox = gtk_event_box_new (); -@@ -265,10 +260,6 @@ - - obj->priv = g_new0 (BraseroProjectTypeChooserPrivate, 1); - -- obj->priv->tooltips = gtk_tooltips_new (); -- g_object_ref_sink (obj->priv->tooltips); -- gtk_tooltips_enable (obj->priv->tooltips); -- - obj->priv->background = gdk_pixbuf_new_from_file (BRASERO_DATADIR "/logo.png", &error); - if (error) { - g_warning ("ERROR loading background pix : %s\n", error->message); -@@ -369,11 +360,6 @@ - - cobj = BRASERO_PROJECT_TYPE_CHOOSER (object); - -- if (cobj->priv->tooltips) { -- g_object_unref (cobj->priv->tooltips); -- cobj->priv->tooltips = NULL; -- } -- - if (cobj->priv->background) { - g_object_unref (G_OBJECT (cobj->priv->background)); - cobj->priv->background = NULL; ---- brasero-0.6.0/src/brasero-project-size.c~ 2007-07-11 14:48:14.000000000 +0200 -+++ brasero-0.6.0/src/brasero-project-size.c 2007-08-10 19:18:03.000000000 +0200 -@@ -93,7 +93,6 @@ - - struct _BraseroProjectSizePrivate { - GtkWidget *menu; -- GtkTooltips *tooltips; - - GtkWidget *frame; - GtkWidget *arrow; -@@ -232,15 +231,11 @@ - obj->priv = g_new0 (BraseroProjectSizePrivate, 1); - obj->priv->text_layout = gtk_widget_create_pango_layout (GTK_WIDGET (obj), ""); - -- obj->priv->tooltips = gtk_tooltips_new (); -- - brasero_project_size_add_default_medias (obj); - - obj->priv->button = gtk_toggle_button_new (); -- gtk_tooltips_set_tip (obj->priv->tooltips, -- obj->priv->button, -- _("Show the available media to be burnt"), -- _("Show the available media to be burnt")); -+ gtk_widget_set_tooltip_text (obj->priv->button, -+ _("Show the available media to be burnt")); - gtk_container_set_border_width (GTK_CONTAINER (obj->priv->button), 0); - g_signal_connect (obj->priv->button, - "toggled", -@@ -275,11 +270,6 @@ - - cobj = BRASERO_PROJECT_SIZE (object); - -- if (cobj->priv->tooltips) { -- g_object_ref_sink (GTK_OBJECT (cobj->priv->tooltips)); -- cobj->priv->tooltips = NULL; -- } -- - if (cobj->priv->frame) { - gtk_widget_unparent (cobj->priv->frame); - cobj->priv->frame = NULL; ---- brasero-0.6.0/src/audio-disc.c~ 2007-07-11 14:48:14.000000000 +0200 -+++ brasero-0.6.0/src/audio-disc.c 2007-08-10 19:13:07.000000000 +0200 -@@ -274,7 +274,6 @@ - - gint64 sectors; - -- GtkTooltips *tooltip; - GdkDragContext *drag_context; - - int activity_counter; -@@ -518,10 +517,8 @@ - "changed", - G_CALLBACK (brasero_audio_disc_selection_changed), - button); -- gtk_tooltips_set_tip (audio_disc->priv->tooltip, -- button, -- _("Add a 2 second pause after the track"), -- NULL); -+ gtk_widget_set_tooltip_text (button, -+ _("Add a 2 second pause after the track")); - gtk_widget_show (button); - - alignment = gtk_alignment_new (1.0, 0.5, 0.0, 0.0); -@@ -542,9 +539,6 @@ - obj->priv = g_new0 (BraseroAudioDiscPrivate, 1); - gtk_box_set_spacing (GTK_BOX (obj), 8); - -- obj->priv->tooltip = gtk_tooltips_new (); -- g_object_ref_sink (obj->priv->tooltip); -- - /* notebook to display information about how to use the tree */ - obj->priv->notebook = brasero_utils_get_use_info_notebook (); - gtk_box_pack_start (GTK_BOX (obj), obj->priv->notebook, TRUE, TRUE, 0); -@@ -816,11 +810,6 @@ - } - - #endif -- if (cobj->priv->tooltip) { -- g_object_unref (cobj->priv->tooltip); -- cobj->priv->tooltip = NULL; -- } -- - if (cobj->priv->vfs) { - brasero_vfs_cancel (cobj->priv->vfs, G_OBJECT (cobj)); - g_object_unref (cobj->priv->vfs); ---- brasero-0.6.0/src/project.c~ 2007-07-11 14:48:14.000000000 +0200 -+++ brasero-0.6.0/src/project.c 2007-08-10 19:34:02.000000000 +0200 -@@ -141,7 +141,6 @@ - GtkWidget *remove; - GtkWidget *burn; - -- GtkTooltips *tooltip; - GtkActionGroup *project_group; - GtkActionGroup *action_group; - -@@ -328,9 +327,6 @@ - obj->priv = g_new0 (BraseroProjectPrivate, 1); - gtk_box_set_spacing (GTK_BOX (obj), BRASERO_PROJECT_SPACING); - -- obj->priv->tooltip = gtk_tooltips_new (); -- g_object_ref_sink (obj->priv->tooltip); -- - /* header */ - box = gtk_hbox_new (FALSE, 8); - gtk_box_pack_start (GTK_BOX (obj), box, FALSE, FALSE, 0); -@@ -372,10 +368,8 @@ - "clicked", - G_CALLBACK (brasero_project_add_clicked_cb), - obj); -- gtk_tooltips_set_tip (obj->priv->tooltip, -- obj->priv->add, -- _("Add selected files"), -- NULL); -+ gtk_widget_set_tooltip_text (obj->priv->add, -+ _("Add selected files")); - - alignment = gtk_alignment_new (1.0, 0.5, 0.0, 0.0); - gtk_container_add (GTK_CONTAINER (alignment), obj->priv->add); -@@ -392,10 +386,8 @@ - "clicked", - G_CALLBACK (brasero_project_remove_clicked_cb), - obj); -- gtk_tooltips_set_tip (obj->priv->tooltip, -- obj->priv->remove, -- _("Remove files selected in project"), -- NULL); -+ gtk_widget_set_tooltip_text (obj->priv->remove, -+ _("Remove files selected in project")); - alignment = gtk_alignment_new (1.0, 0.5, 0.0, 0.0); - gtk_container_add (GTK_CONTAINER (alignment), obj->priv->remove); - gtk_box_pack_start (GTK_BOX (box), alignment, FALSE, FALSE, 0); -@@ -474,10 +466,8 @@ - "clicked", - G_CALLBACK (brasero_project_burn_clicked_cb), - obj); -- gtk_tooltips_set_tip (obj->priv->tooltip, -- obj->priv->burn, -- _("Start to burn the contents of the selection"), -- NULL); -+ gtk_widget_set_tooltip_text (obj->priv->burn, -+ _("Start to burn the contents of the selection")); - alignment = gtk_alignment_new (1.0, 0.0, 0.0, 0.0); - gtk_container_add (GTK_CONTAINER (alignment), obj->priv->burn); - gtk_box_pack_end (GTK_BOX (box), alignment, FALSE, FALSE, 0); -@@ -492,11 +482,6 @@ - if (cobj->priv->project) - g_free (cobj->priv->project); - -- if (cobj->priv->tooltip) { -- g_object_unref (cobj->priv->tooltip); -- cobj->priv->tooltip = NULL; -- } -- - g_free(cobj->priv); - G_OBJECT_CLASS(parent_class)->finalize(object); - } ---- brasero-0.6.0/src/song-properties.c~ 2007-07-11 14:48:14.000000000 +0200 -+++ brasero-0.6.0/src/song-properties.c 2007-08-10 19:36:43.000000000 +0200 -@@ -38,7 +38,6 @@ - #include - #include - #include --#include - - #include - -@@ -50,8 +49,6 @@ - static void brasero_song_props_finalize (GObject *object); - - struct BraseroSongPropsPrivate { -- GtkTooltips *tooltips; -- - GtkWidget *title; - GtkWidget *artist; - GtkWidget *composer; -@@ -109,10 +106,6 @@ - gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (obj)->vbox), 0); - gtk_window_set_default_size (GTK_WINDOW (obj), 400, 300); - -- obj->priv->tooltips = gtk_tooltips_new (); -- g_object_ref (obj->priv->tooltips); -- g_object_ref_sink (GTK_OBJECT (obj->priv->tooltips)); -- - table = gtk_table_new (4, 2, FALSE); - gtk_table_set_row_spacings (GTK_TABLE (table), 4); - gtk_table_set_col_spacings (GTK_TABLE (table), 6); -@@ -135,30 +128,25 @@ - obj->priv->title = gtk_entry_new (); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0); - gtk_table_attach_defaults (GTK_TABLE (table), obj->priv->title, 1, 2, 0, 1); -- gtk_tooltips_set_tip (obj->priv->tooltips, -- obj->priv->title, -- _("This information will be written to the disc using CD-TEXT technology. It can be read and displayed by some audio CD players."), -- NULL); -+ gtk_widget_set_tooltip_text (obj->priv->title, -+ _("This information will be written to the disc using CD-TEXT technology. It can be read and displayed by some audio CD players.")); -+ - - label = gtk_label_new (_("Artist:")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - obj->priv->artist = gtk_entry_new (); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0); - gtk_table_attach_defaults (GTK_TABLE (table), obj->priv->artist, 1, 2, 1, 2); -- gtk_tooltips_set_tip (obj->priv->tooltips, -- obj->priv->artist, -- _("This information will be written to the disc using CD-TEXT technology. It can be read and displayed by some audio CD players."), -- NULL); -+ gtk_widget_set_tooltip_text (obj->priv->artist, -+ _("This information will be written to the disc using CD-TEXT technology. It can be read and displayed by some audio CD players.")); - - label = gtk_label_new (_("Composer:\t")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - obj->priv->composer = gtk_entry_new (); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, GTK_FILL, GTK_FILL, 0, 0); - gtk_table_attach_defaults (GTK_TABLE (table), obj->priv->composer, 1, 2, 2, 3); -- gtk_tooltips_set_tip (obj->priv->tooltips, -- obj->priv->composer, -- _("This information will be written to the disc using CD-TEXT technology. It can be read and displayed by some audio CD players."), -- NULL); -+ gtk_widget_set_tooltip_text (obj->priv->composer, -+ _("This information will be written to the disc using CD-TEXT technology. It can be read and displayed by some audio CD players.")); - - label = gtk_label_new ("ISRC:"); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); -@@ -181,10 +169,8 @@ - obj->priv->gap = gtk_spin_button_new_with_range (0.0, 100.0, 1.0); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0); - gtk_table_attach (GTK_TABLE (table), obj->priv->gap, 1, 2, 0, 1, 0, 0, 0, 0); -- gtk_tooltips_set_tip (obj->priv->tooltips, -- obj->priv->gap, -- _("Gives the length of the pause that should follow the track"), -- NULL); -+ gtk_widget_set_tooltip_text (obj->priv->gap, -+ _("Gives the length of the pause that should follow the track")); - - /* buttons */ - gtk_dialog_add_buttons (GTK_DIALOG (obj), -@@ -202,7 +188,6 @@ - - cobj = BRASERO_SONG_PROPS(object); - -- g_object_unref (cobj->priv->tooltips); - g_free (cobj->priv); - - G_OBJECT_CLASS (parent_class)->finalize (object); ---- brasero-0.6.0/src/data-disc.c~ 2007-07-11 14:48:14.000000000 +0200 -+++ brasero-0.6.0/src/data-disc.c 2007-08-10 19:12:03.000000000 +0200 -@@ -57,7 +57,6 @@ - #include - #include - #include --#include - - #include - -@@ -104,7 +103,6 @@ - GtkWidget *tree; - GtkTreeModel *model; - GtkTreeModel *sort; -- GtkTooltips *tooltip; - GtkWidget *filter_dialog; - GtkWidget *filter_button; - GtkWidget *notebook; -@@ -1081,10 +1079,8 @@ - FALSE, - 0); - -- gtk_tooltips_set_tip (data_disc->priv->tooltip, -- data_disc->priv->filter_button, -- _("Display the files filtered from the project"), -- NULL); -+ gtk_widget_set_tooltip_text (data_disc->priv->filter_button, -+ _("Display the files filtered from the project")); - - /* Import session */ - button = gtk_toggle_button_new (); -@@ -1099,10 +1095,8 @@ - "clicked", - G_CALLBACK (brasero_data_disc_import_session_cb), - disc); -- gtk_tooltips_set_tip (data_disc->priv->tooltip, -- button, -- _("Import session"), -- NULL); -+ gtk_widget_set_tooltip_text (button, -+ _("Import session")); - gtk_box_pack_end (GTK_BOX (toolbar), - button, - FALSE, -@@ -1132,10 +1126,8 @@ - "clicked", - G_CALLBACK (brasero_data_disc_new_folder_clicked_cb), - data_disc); -- gtk_tooltips_set_tip (data_disc->priv->tooltip, -- button, -- _("Create a new empty folder"), -- NULL); -+ gtk_widget_set_tooltip_text (button, -+ _("Create a new empty folder")); - gtk_box_pack_end (GTK_BOX (toolbar), - button, - FALSE, -@@ -1157,8 +1149,6 @@ - - obj->priv->vfs = brasero_vfs_get_default (); - -- obj->priv->tooltip = gtk_tooltips_new (); -- - /* the information displayed about how to use this tree */ - obj->priv->notebook = brasero_utils_get_use_info_notebook (); - gtk_box_pack_start (GTK_BOX (obj), obj->priv->notebook, TRUE, TRUE, 0); -@@ -1431,11 +1421,6 @@ - g_hash_table_destroy (cobj->priv->dirs); - g_hash_table_destroy (cobj->priv->files); - -- if (cobj->priv->tooltip) { -- g_object_ref_sink (GTK_OBJECT (cobj->priv->tooltip)); -- g_object_unref (cobj->priv->tooltip); -- } -- - if (cobj->priv->path_refs) - g_hash_table_destroy (cobj->priv->path_refs); - -@@ -3075,7 +3060,7 @@ - NULL); - - /* we can now signal the user that some files were removed */ -- gtk_tooltips_enable (disc->priv->tooltip); -+ /* gtk_tooltips_enable (disc->priv->tooltip); */ - - if (filter_notify) - brasero_data_disc_notify_user (disc, ---- brasero-0.6.0/src/brasero-disc-option-dialog.c~ 2007-07-11 14:48:14.000000000 +0200 -+++ brasero-0.6.0/src/brasero-disc-option-dialog.c 2007-08-10 19:16:17.000000000 +0200 -@@ -67,8 +67,6 @@ - GtkWidget *selection; - GtkWidget *label; - -- GtkTooltips *tooltips; -- - gint label_modified:1; - }; - -@@ -246,10 +244,8 @@ - /* DVD don't need that */ - dont_close_check = gtk_check_button_new_with_label (_("Leave the disc open to add other files later")); - dialog->priv->close_check = dont_close_check; -- gtk_tooltips_set_tip (dialog->priv->tooltips, -- dont_close_check, -- _("Allow to add more data to the disc later"), -- _("Allow to add more data to the disc later")); -+ gtk_widget_set_tooltip_text (dont_close_check, -+ _("Allow to add more data to the disc later")); - - options = brasero_utils_pack_properties (_("Multisession"), - dont_close_check, -@@ -386,10 +382,8 @@ - - /* general options */ - dialog->priv->joliet_toggle = gtk_check_button_new_with_label (_("Increase compatibility with Windows systems")); -- gtk_tooltips_set_tip (dialog->priv->tooltips, -- dialog->priv->joliet_toggle, -- _("Improve compatibility with Windows systems by allowing to display long filenames (maximum 64 characters)"), -- _("Improve compatibility with Windows systems by allowing to display long filenames (maximum 64 characters)")); -+ gtk_widget_set_tooltip_text (dialog->priv->joliet_toggle, -+ _("Improve compatibility with Windows systems by allowing to display long filenames (maximum 64 characters)")); - - /* NOTE: we take for granted that if the source does not require - * to have the joliet extension, it's because it does have some -@@ -403,10 +397,8 @@ - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->priv->joliet_toggle), TRUE); - - dialog->priv->checksum_toggle = gtk_check_button_new_with_label (_("Check data integrity")); -- gtk_tooltips_set_tip (dialog->priv->tooltips, -- dialog->priv->checksum_toggle, -- _("Allow to check the integrity of files on the disc"), -- _("Allow to check the integrity of files on the disc")); -+ gtk_widget_set_tooltip_text (dialog->priv->checksum_toggle, -+ _("Allow to check the integrity of files on the disc")); - - client = gconf_client_get_default (); - checksum = gconf_client_get_bool (client, KEY_ACTIVATE_CHECKSUM, NULL); -@@ -424,10 +416,8 @@ - G_CALLBACK (brasero_disc_option_dialog_video_clicked), - dialog); - -- gtk_tooltips_set_tip (dialog->priv->tooltips, -- dialog->priv->video_toggle, -- _("Create a video DVD that can be played by all DVD readers"), -- _("Create a video DVD that can be played by all DVD readers")); -+ gtk_widget_set_tooltip_text (dialog->priv->video_toggle, -+ _("Create a video DVD that can be played by all DVD readers")); - } - - options = brasero_utils_pack_properties (_("Disc options"), -@@ -461,10 +451,8 @@ - /* multisession options */ - dont_close_check = gtk_check_button_new_with_label (_("Leave the disc open to add a data session later")); - dialog->priv->close_check = dont_close_check; -- gtk_tooltips_set_tip (dialog->priv->tooltips, -- dont_close_check, -- _("Allow create what is called an enhanced CD or CD+"), -- _("Allow create what is called an enhanced CD or CD+")); -+ gtk_widget_set_tooltip_text (dont_close_check, -+ _("Allow create what is called an enhanced CD or CD+")); - - options = brasero_utils_pack_properties (_("Multisession"), - dont_close_check, -@@ -657,9 +645,6 @@ - obj->priv = g_new0 (BraseroDiscOptionDialogPrivate, 1); - gtk_dialog_set_has_separator (GTK_DIALOG (obj), FALSE); - -- obj->priv->tooltips = gtk_tooltips_new (); -- g_object_ref_sink (GTK_OBJECT (obj->priv->tooltips)); -- - obj->priv->caps = brasero_burn_caps_get_default (); - - /* first box */ -@@ -683,10 +668,8 @@ - - brasero_recorder_selection_select_default_drive (BRASERO_RECORDER_SELECTION (obj->priv->selection), - BRASERO_MEDIUM_WRITABLE); -- gtk_tooltips_set_tip (obj->priv->tooltips, -- obj->priv->selection, -- _("Choose which drive holds the disc to write to"), -- _("Choose which drive holds the disc to write to")); -+ gtk_widget_set_tooltip_text (obj->priv->selection, -+ _("Choose which drive holds the disc to write to")); - - g_signal_connect (obj->priv->selection, - "media-changed", -@@ -726,11 +709,6 @@ - cobj->priv->caps = NULL; - } - -- if (cobj->priv->tooltips) { -- g_object_unref (cobj->priv->tooltips); -- cobj->priv->tooltips = NULL; -- } -- - if (cobj->priv->track) { - brasero_track_source_free (cobj->priv->track); - cobj->priv->track = NULL; ---- brasero-0.6.0/src/brasero-image-option-dialog.c~ 2007-07-11 14:48:14.000000000 +0200 -+++ brasero-0.6.0/src/brasero-image-option-dialog.c 2007-08-10 19:17:30.000000000 +0200 -@@ -59,8 +59,6 @@ - GtkWidget *format_chooser; - GtkWidget *selection; - GtkWidget *chooser; -- -- GtkTooltips *tooltips; - }; - - static GtkDialogClass *parent_class = NULL; -@@ -397,9 +395,6 @@ - obj->priv = g_new0 (BraseroImageOptionDialogPrivate, 1); - gtk_dialog_set_has_separator (GTK_DIALOG (obj), FALSE); - -- obj->priv->tooltips = gtk_tooltips_new (); -- g_object_ref_sink (GTK_OBJECT (obj->priv->tooltips)); -- - /* first box */ - obj->priv->selection = brasero_recorder_selection_new (); - g_object_set (G_OBJECT (obj->priv->selection), -@@ -420,10 +415,8 @@ - - brasero_recorder_selection_select_default_drive (BRASERO_RECORDER_SELECTION (obj->priv->selection), - BRASERO_MEDIUM_WRITABLE); -- gtk_tooltips_set_tip (obj->priv->tooltips, -- obj->priv->selection, -- _("Choose which drive holds the disc to write to"), -- _("Choose which drive holds the disc to write to")); -+ gtk_widget_set_tooltip_text (obj->priv->selection, -+ _("Choose which drive holds the disc to write to")); - - g_object_set (obj->priv->selection, "file-image", FALSE, NULL); - -@@ -495,11 +488,6 @@ - cobj->priv->track = NULL; - } - -- if (cobj->priv->tooltips) { -- g_object_unref (cobj->priv->tooltips); -- cobj->priv->tooltips = NULL; -- } -- - g_free (cobj->priv); - G_OBJECT_CLASS (parent_class)->finalize (object); - } ---- brasero-0.6.0/src/search-entry.c~ 2007-07-11 14:48:14.000000000 +0200 -+++ brasero-0.6.0/src/search-entry.c 2007-08-10 19:07:45.000000000 +0200 -@@ -51,7 +51,6 @@ - #include - #include - #include --#include - #include - #include - -@@ -76,8 +75,6 @@ - GtkWidget *pictures; - GtkWidget *music; - GtkWidget *video; -- -- GtkTooltips *tooltip; - }; - - /* cut and pasted from nautilus */ -@@ -460,33 +457,20 @@ - obj); - - /* add tooltips */ -- obj->priv->tooltip = gtk_tooltips_new (); -- g_object_ref_sink (obj->priv->tooltip); -- -- gtk_tooltips_set_tip (obj->priv->tooltip, -- GTK_BIN (obj->priv->combo)->child, -- _("Type your keywords or choose 'All files' from the menu"), -- NULL); -- gtk_tooltips_set_tip (obj->priv->tooltip, -- obj->priv->pictures, -- _("Select if you want to search among image files only"), -- NULL); -- gtk_tooltips_set_tip (obj->priv->tooltip, -- obj->priv->video, -- _("Select if you want to search among video files only"), -- NULL); -- gtk_tooltips_set_tip (obj->priv->tooltip, -- obj->priv->music, -- _("Select if you want to search among audio files only"), -- NULL); -- gtk_tooltips_set_tip (obj->priv->tooltip, -- obj->priv->documents, -- _("Select if you want to search among your text documents only"), -- NULL); -- gtk_tooltips_set_tip (obj->priv->tooltip, -- obj->priv->button, -- _("Click to start the search"), -- NULL); -+ gtk_widget_set_tooltip_text (GTK_BIN (obj->priv->combo)->child, -+ _("Type your keywords or choose 'All files' from the menu")); -+ gtk_widget_set_tooltip_text (GTK_BIN (obj->priv->combo)->child, -+ _("Type your keywords or choose 'All files' from the menu")); -+ gtk_widget_set_tooltip_text(obj->priv->pictures, -+ _("Select if you want to search among image files only")); -+ gtk_widget_set_tooltip_text (obj->priv->video, -+ _("Select if you want to search among video files only")); -+ gtk_widget_set_tooltip_text (obj->priv->music, -+ _("Select if you want to search among audio files only")); -+ gtk_widget_set_tooltip_text (obj->priv->documents, -+ _("Select if you want to search among your text documents only")); -+ gtk_widget_set_tooltip_text (obj->priv->button, -+ _("Click to start the search")); - - /* Set up GConf Client */ - obj->priv->client = gconf_client_get_default (); -@@ -557,11 +541,6 @@ - cobj->priv->search_id = 0; - } - -- if (cobj->priv->tooltip) { -- g_object_unref (cobj->priv->tooltip); -- cobj->priv->tooltip = NULL; -- } -- - g_free (cobj->priv); - cobj->priv = NULL; -