file-roller r2246 - in trunk: . src

[paobac svn gnome org]

Author: paobac
Date: Tue Apr 15 12:03:00 2008
New Revision: 2246
URL: http://svn.gnome.org/viewvc/file-roller?rev=2246&view=rev

Log:


Modified:
   trunk/ChangeLog
   trunk/src/dlg-add-folder.c
   trunk/src/dlg-extract.c
   trunk/src/fr-window.c

Modified: trunk/src/dlg-add-folder.c
==============================================================================
--- trunk/src/dlg-add-folder.c	(original)
+++ trunk/src/dlg-add-folder.c	Tue Apr 15 12:03:00 2008
@@ -40,7 +40,6 @@
 
 typedef struct {
 	FrWindow    *window;
-	GtkTooltips *tooltips;
 	GtkWidget   *dialog;
 	GtkWidget   *include_subfold_checkbutton;
 	GtkWidget   *add_if_newer_checkbutton;
@@ -61,7 +60,6 @@
 open_file_destroy_cb (GtkWidget  *widget,
 		      DialogData *data)
 {
-	g_object_unref (data->tooltips);
 	g_free (data->last_options);
 	g_free (data);
 }
@@ -258,10 +256,6 @@
 
 	data->window = callback_data;
 
-	data->tooltips = gtk_tooltips_new ();
-	g_object_ref (G_OBJECT (data->tooltips));
-	gtk_object_sink (GTK_OBJECT (data->tooltips));
-
 	data->dialog = file_sel =
 		gtk_file_chooser_dialog_new (_("Add a Folder"),
 					     GTK_WINDOW (data->window),
@@ -282,12 +276,12 @@
 	data->exclude_symlinks = gtk_check_button_new_with_mnemonic (_("Exclude folders that are symbolic lin_ks"));
 
 	data->include_files_entry = gtk_entry_new ();
-	gtk_tooltips_set_tip (data->tooltips, data->include_files_entry, _("example: *.o; *.bak"), NULL);
+	gtk_widget_set_tooltip_text (data->include_files_entry, _("example: *.o; *.bak"));
 	data->include_files_label = gtk_label_new_with_mnemonic (_("_Include files:"));
 	gtk_misc_set_alignment (GTK_MISC (data->include_files_label), 0.0, 0.5);
 
 	data->exclude_files_entry = gtk_entry_new ();
-	gtk_tooltips_set_tip (data->tooltips, data->exclude_files_entry, _("example: *.o; *.bak"), NULL);
+	gtk_widget_set_tooltip_text (data->exclude_files_entry, _("example: *.o; *.bak"));
 	data->exclude_files_label = gtk_label_new_with_mnemonic (_("E_xclude files:"));
 	gtk_misc_set_alignment (GTK_MISC (data->exclude_files_label), 0.0, 0.5);
 

Modified: trunk/src/dlg-extract.c
==============================================================================
--- trunk/src/dlg-extract.c	(original)
+++ trunk/src/dlg-extract.c	Tue Apr 15 12:03:00 2008
@@ -56,8 +56,6 @@
 
 	GtkWidget    *e_view_folder_checkbutton;
 
-	GtkTooltips  *tooltips;
-
 	gboolean      extract_clicked;
 } DialogData;
 
@@ -73,7 +71,6 @@
 	}
 	path_list_free (data->selected_files);
 	g_free (data->base_dir_for_selection);
-	g_object_unref (data->tooltips);
 	g_free (data);
 }
 
@@ -388,7 +385,7 @@
 	gtk_table_attach (GTK_TABLE (table1), data->e_files_entry, 1, 2, 2, 3,
 			  (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
 			  (GtkAttachOptions) (0), 0, 0);
-	gtk_tooltips_set_tip (data->tooltips, data->e_files_entry, _("example: *.txt; *.doc"), NULL);
+	gtk_widget_set_tooltip_text (data->e_files_entry, _("example: *.txt; *.doc"));
 	gtk_entry_set_activates_default (GTK_ENTRY (data->e_files_entry), TRUE);
 
 	data->e_all_radiobutton = gtk_radio_button_new_with_mnemonic (NULL, _("_All files"));
@@ -474,10 +471,6 @@
 	data->base_dir_for_selection = base_dir_for_selection;
 	data->extract_clicked = FALSE;
 
-	data->tooltips = gtk_tooltips_new ();
-	g_object_ref (G_OBJECT (data->tooltips));
-	gtk_object_sink (GTK_OBJECT (data->tooltips));
-
 	data->dialog = file_sel =
 		gtk_file_chooser_dialog_new (_("Extract"),
 					     GTK_WINDOW (data->window),

Modified: trunk/src/fr-window.c
==============================================================================
--- trunk/src/fr-window.c	(original)
+++ trunk/src/fr-window.c	Tue Apr 15 12:03:00 2008
@@ -245,7 +245,6 @@
 	gboolean         filter_mode;
 	gint             current_view_length;
 
-	GtkTooltips     *tooltips;
 	guint            help_message_cid;
 	guint            list_info_cid;
 	guint            progress_cid;
@@ -507,8 +506,6 @@
 		priv->recent_toolbar_menu = NULL;
 	}
 
-	g_object_unref (G_OBJECT (priv->tooltips));
-
 	while (priv->activity_ref > 0)
 		fr_window_stop_activity_mode (window);
 
@@ -4906,10 +4903,6 @@
 	
 	/* Create the widgets. */
 
-	window->priv->tooltips = gtk_tooltips_new ();
-	g_object_ref (G_OBJECT (window->priv->tooltips));
-	gtk_object_sink (GTK_OBJECT (window->priv->tooltips));
-
 	/* * File list. */
 
 	window->priv->list_store = fr_list_model_new (NUMBER_OF_COLUMNS,
@@ -5080,7 +5073,7 @@
 	close_sidepane_button = gtk_button_new ();
 	gtk_container_add (GTK_CONTAINER (close_sidepane_button), gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU));
 	gtk_button_set_relief (GTK_BUTTON (close_sidepane_button), GTK_RELIEF_NONE);
-	gtk_tooltips_set_tip (window->priv->tooltips, close_sidepane_button, _("Close the folders pane"), NULL);
+	gtk_widget_set_tooltip_text (close_sidepane_button, _("Close the folders pane"));
 	g_signal_connect (close_sidepane_button,
 			  "clicked",
 			  G_CALLBACK (close_sidepane_button_clicked_cb),
@@ -5214,9 +5207,9 @@
 	open_recent_tool_item = gtk_menu_tool_button_new_from_stock (GTK_STOCK_OPEN);
 	gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (open_recent_tool_item), window->priv->recent_chooser_toolbar);
 	gtk_tool_item_set_homogeneous (open_recent_tool_item, FALSE);
-	gtk_tool_item_set_tooltip (open_recent_tool_item, window->priv->tooltips, _("Open archive"), NULL);
-	gtk_menu_tool_button_set_arrow_tooltip (GTK_MENU_TOOL_BUTTON (open_recent_tool_item), window->priv->tooltips,	_("Open a recently used archive"), NULL);
-
+	gtk_widget_set_tooltip_text (GTK_WIDGET (open_recent_tool_item), _("Open archive"));
+	gtk_menu_tool_button_set_arrow_tooltip_text (GTK_MENU_TOOL_BUTTON (open_recent_tool_item), _("Open a recently used archive"));
+	
 	window->priv->open_action = gtk_action_new ("Toolbar_Open", _("Open"), _("Open archive"), GTK_STOCK_OPEN);
 	g_object_set (window->priv->open_action, "is_important", TRUE, NULL);
 	g_signal_connect (window->priv->open_action,
@@ -5227,24 +5220,6 @@
 
 	gtk_widget_show (GTK_WIDGET (open_recent_tool_item));
 	gtk_toolbar_insert (GTK_TOOLBAR (toolbar), open_recent_tool_item, 1);
-
-	/**/
-
-	/*
-	open_recent_tool_item = gtk_menu_tool_button_new_from_stock (FR_STOCK_ADD);
-	gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (open_recent_tool_item),
-				       gtk_ui_manager_get_widget (ui, "/AddMenu"));
-	gtk_tool_item_set_homogeneous (open_recent_tool_item, FALSE);
-	gtk_tool_item_set_tooltip (open_recent_tool_item, window->priv->tooltips, _("Add files to the archive"), NULL);
-	gtk_menu_tool_button_set_arrow_tooltip (GTK_MENU_TOOL_BUTTON (open_recent_tool_item), window->priv->tooltips,  _("Add files to the archive"), NULL);
-	gtk_action_connect_proxy (gtk_ui_manager_get_action (ui, "/Toolbar/AddFiles_Toolbar"),
-				  GTK_WIDGET (open_recent_tool_item));
-
-	gtk_widget_show (GTK_WIDGET (open_recent_tool_item));
-	gtk_toolbar_insert (GTK_TOOLBAR (toolbar),
-			    open_recent_tool_item,
-			    4);
-	*/
 	
 	/**/