gedit r6613 - in trunk: . gedit plugins/filebrowser
- From: pborelli svn gnome org
- To: svn-commits-list gnome org
- Subject: gedit r6613 - in trunk: . gedit plugins/filebrowser
- Date: Mon, 24 Nov 2008 12:55:02 +0000 (UTC)
Author: pborelli
Date: Mon Nov 24 12:55:02 2008
New Revision: 6613
URL: http://svn.gnome.org/viewvc/gedit?rev=6613&view=rev
Log:
2008-11-24 Paolo Borelli <pborelli katamail com>
* plugins/filebrowser/gedit-file-browser-widget.c::
* gedit/gedit-window.c:
* gedit/gedit-print-preview.c:
* gedit/gedit-view.h:
Remove deprecated gtk functions. Patch by Maxim Ermilov.
Modified:
trunk/ChangeLog
trunk/gedit/gedit-print-preview.c
trunk/gedit/gedit-view.h
trunk/gedit/gedit-window.c
trunk/plugins/filebrowser/gedit-file-browser-widget.c
Modified: trunk/gedit/gedit-print-preview.c
==============================================================================
--- trunk/gedit/gedit-print-preview.c (original)
+++ trunk/gedit/gedit-print-preview.c Mon Nov 24 12:55:02 2008
@@ -558,9 +558,7 @@
gtk_tool_button_set_label (GTK_TOOL_BUTTON (priv->prev),
"P_revious Page");
gtk_tool_button_set_use_underline (GTK_TOOL_BUTTON (priv->prev), TRUE);
- gtk_tool_item_set_tooltip (priv->prev,
- GTK_TOOLBAR (toolbar)->tooltips,
- _("Show the previous page"), "");
+ gtk_tool_item_set_tooltip_text (priv->prev, _("Show the previous page"));
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), priv->prev, -1);
g_signal_connect (priv->prev,
"clicked",
@@ -572,9 +570,7 @@
gtk_tool_button_set_label (GTK_TOOL_BUTTON (priv->next),
"_Next Page");
gtk_tool_button_set_use_underline (GTK_TOOL_BUTTON (priv->next), TRUE);
- gtk_tool_item_set_tooltip (priv->next,
- GTK_TOOLBAR (toolbar)->tooltips,
- _("Show the next page"), "");
+ gtk_tool_item_set_tooltip_text (priv->next, _("Show the next page"));
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), priv->next, -1);
g_signal_connect (priv->next,
"clicked",
@@ -590,8 +586,7 @@
priv->page_entry = gtk_entry_new ();
gtk_entry_set_width_chars (GTK_ENTRY (priv->page_entry), 3);
gtk_entry_set_max_length (GTK_ENTRY (priv->page_entry), 6);
- gtk_widget_set_tooltip_text (priv->page_entry,
- _("Current page (Alt+P)"));
+ gtk_widget_set_tooltip_text (priv->page_entry, _("Current page (Alt+P)"));
g_signal_connect (priv->page_entry,
"activate",
@@ -639,9 +634,7 @@
gtk_tool_button_set_label (GTK_TOOL_BUTTON (priv->multi),
"_Show Multiple Pages");
gtk_tool_button_set_use_underline (GTK_TOOL_BUTTON (priv->multi), TRUE);
- gtk_tool_item_set_tooltip (priv->multi,
- GTK_TOOLBAR (toolbar)->tooltips,
- _("Show multiple pages"), "");
+ gtk_tool_item_set_tooltip_text (priv->multi, _("Show multiple pages"));
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), priv->multi, -1);
g_signal_connect (priv->multi,
"clicked",
@@ -654,9 +647,7 @@
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), i, -1);
priv->zoom_one = gtk_tool_button_new_from_stock (GTK_STOCK_ZOOM_100);
- gtk_tool_item_set_tooltip (priv->zoom_one,
- GTK_TOOLBAR (toolbar)->tooltips,
- _("Zoom 1:1"), "");
+ gtk_tool_item_set_tooltip_text (priv->zoom_one, _("Zoom 1:1"));
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), priv->zoom_one, -1);
g_signal_connect (priv->zoom_one,
"clicked",
@@ -665,9 +656,7 @@
gtk_widget_show (GTK_WIDGET (priv->zoom_one));
priv->zoom_fit = gtk_tool_button_new_from_stock (GTK_STOCK_ZOOM_FIT);
- gtk_tool_item_set_tooltip (priv->zoom_fit,
- GTK_TOOLBAR (toolbar)->tooltips,
- _("Zoom to fit the whole page"), "");
+ gtk_tool_item_set_tooltip_text (priv->zoom_fit, _("Zoom to fit the whole page"));
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), priv->zoom_fit, -1);
g_signal_connect (priv->zoom_fit,
"clicked",
@@ -676,9 +665,7 @@
gtk_widget_show (GTK_WIDGET (priv->zoom_fit));
priv->zoom_in = gtk_tool_button_new_from_stock (GTK_STOCK_ZOOM_IN);
- gtk_tool_item_set_tooltip (priv->zoom_in,
- GTK_TOOLBAR (toolbar)->tooltips,
- _("Zoom the page in"), "");
+ gtk_tool_item_set_tooltip_text (priv->zoom_in, _("Zoom the page in"));
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), priv->zoom_in, -1);
g_signal_connect (priv->zoom_in,
"clicked",
@@ -687,9 +674,7 @@
gtk_widget_show (GTK_WIDGET (priv->zoom_in));
priv->zoom_out = gtk_tool_button_new_from_stock (GTK_STOCK_ZOOM_OUT);
- gtk_tool_item_set_tooltip (priv->zoom_out,
- GTK_TOOLBAR (toolbar)->tooltips,
- _("Zoom the page out"), "");
+ gtk_tool_item_set_tooltip_text (priv->zoom_out, _("Zoom the page out"));
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), priv->zoom_out, -1);
g_signal_connect (priv->zoom_out,
"clicked",
@@ -704,8 +689,7 @@
i = gtk_tool_button_new (NULL, _("_Close Preview"));
gtk_tool_button_set_use_underline (GTK_TOOL_BUTTON (i), TRUE);
gtk_tool_item_set_is_important (i, TRUE);
- gtk_tool_item_set_tooltip (i, GTK_TOOLBAR (toolbar)->tooltips,
- _("Close print preview"), "");
+ gtk_tool_item_set_tooltip_text (i, _("Close print preview"));
g_signal_connect (i, "clicked",
G_CALLBACK (close_button_clicked), preview);
gtk_widget_show (GTK_WIDGET (i));
Modified: trunk/gedit/gedit-view.h
==============================================================================
--- trunk/gedit/gedit-view.h (original)
+++ trunk/gedit/gedit-view.h Mon Nov 24 12:55:02 2008
@@ -80,14 +80,14 @@
gboolean (* start_interactive_goto_line)(GeditView *view);
gboolean (* reset_searched_text) (GeditView *view);
- void (* drop_uris) (GeditView *view,
+ void (* drop_uris) (GeditView *view,
gchar **uri_list);
};
/*
* Public methods
*/
-GtkType gedit_view_get_type (void) G_GNUC_CONST;
+GType gedit_view_get_type (void) G_GNUC_CONST;
GtkWidget *gedit_view_new (GeditDocument *doc);
Modified: trunk/gedit/gedit-window.c
==============================================================================
--- trunk/gedit/gedit-window.c (original)
+++ trunk/gedit/gedit-window.c Mon Nov 24 12:55:02 2008
@@ -56,6 +56,7 @@
#include "gedit-enum-types.h"
#define LANGUAGE_NONE (const gchar *)"LangNone"
+#define GEDIT_UIFILE "gedit-ui.xml"
#define GEDIT_WINDOW_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object),\
GEDIT_TYPE_WINDOW, \
@@ -1380,10 +1381,10 @@
window->priv->quit_action_group = action_group;
/* now load the UI definition */
- gtk_ui_manager_add_ui_from_file (manager, GEDIT_UIDIR "gedit-ui.xml", &error);
+ gtk_ui_manager_add_ui_from_file (manager, GEDIT_UIDIR GEDIT_UIFILE, &error);
if (error != NULL)
{
- g_warning ("Could not merge gedit-ui.xml: %s", error->message);
+ g_warning ("Could not merge %s: %s", GEDIT_UIFILE, error->message);
g_error_free (error);
}
@@ -1474,18 +1475,9 @@
gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (open_button),
window->priv->toolbar_recent_menu);
- /* not very nice the way we access the tooltops object
- * but I can't see a better way and I don't want a differen GtkTooltip
- * just for this tool button.
- */
- gtk_tool_item_set_tooltip (open_button,
- GTK_TOOLBAR (window->priv->toolbar)->tooltips,
- _("Open a file"),
- NULL);
- gtk_menu_tool_button_set_arrow_tooltip (GTK_MENU_TOOL_BUTTON (open_button),
- GTK_TOOLBAR (window->priv->toolbar)->tooltips,
- _("Open a recently used file"),
- NULL);
+ gtk_tool_item_set_tooltip_text (open_button, _("Open a file"));
+ gtk_menu_tool_button_set_arrow_tooltip_text (GTK_MENU_TOOL_BUTTON (open_button),
+ _("Open a recently used file"));
action = gtk_action_group_get_action (window->priv->always_sensitive_action_group,
"FileOpen");
Modified: trunk/plugins/filebrowser/gedit-file-browser-widget.c
==============================================================================
--- trunk/plugins/filebrowser/gedit-file-browser-widget.c (original)
+++ trunk/plugins/filebrowser/gedit-file-browser-widget.c Mon Nov 24 12:55:02 2008
@@ -41,8 +41,11 @@
#include "gedit-file-browser-marshal.h"
#include "gedit-file-browser-enum-types.h"
-#define GEDIT_FILE_BROWSER_WIDGET_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GEDIT_TYPE_FILE_BROWSER_WIDGET, GeditFileBrowserWidgetPrivate))
-#define XML_UI_FILE GEDIT_UIDIR "/gedit-file-browser-widget-ui.xml"
+#define GEDIT_FILE_BROWSER_WIDGET_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), \
+ GEDIT_TYPE_FILE_BROWSER_WIDGET, \
+ GeditFileBrowserWidgetPrivate))
+
+#define XML_UI_FILE GEDIT_UIDIR "gedit-file-browser-widget-ui.xml"
#define LOCATION_DATA_KEY "gedit-file-browser-widget-location"
enum
@@ -337,7 +340,7 @@
location_free ((Location *) (loc->data));
if (obj->priv->current_location_menu_item)
- gtk_widget_unref (obj->priv->current_location_menu_item);
+ g_object_unref (obj->priv->current_location_menu_item);
g_list_free (obj->priv->locations);
@@ -423,7 +426,7 @@
G_STRUCT_OFFSET (GeditFileBrowserWidgetClass,
uri_activated), NULL, NULL,
g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1,
- GTK_TYPE_STRING);
+ G_TYPE_STRING);
signals[ERROR] =
g_signal_new ("error", G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
@@ -443,7 +446,7 @@
G_TYPE_BOOLEAN,
2,
G_TYPE_OBJECT,
- GTK_TYPE_POINTER);
+ G_TYPE_POINTER);
signals[CONFIRM_NO_TRASH] =
g_signal_new ("confirm-no-trash", G_OBJECT_CLASS_TYPE (object_class),
@@ -455,7 +458,7 @@
gedit_file_browser_marshal_BOOL__POINTER,
G_TYPE_BOOLEAN,
1,
- GTK_TYPE_POINTER);
+ G_TYPE_POINTER);
g_type_class_add_private (object_class,
sizeof (GeditFileBrowserWidgetPrivate));
@@ -919,64 +922,43 @@
obj->priv->location_previous_menu = gtk_menu_new ();
gtk_widget_show (obj->priv->location_previous_menu);
- widget =
- GTK_WIDGET (gtk_menu_tool_button_new_from_stock
- (GTK_STOCK_GO_BACK));
+ widget = GTK_WIDGET (gtk_menu_tool_button_new_from_stock (GTK_STOCK_GO_BACK));
gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (widget),
obj->priv->location_previous_menu);
g_object_set (widget, "label", _("Previous location"), NULL);
+ gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (widget),
+ _("Go to previous location"));
+ gtk_menu_tool_button_set_arrow_tooltip_text (GTK_MENU_TOOL_BUTTON (widget),
+ _("Go to a previously opened location"));
- gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (widget),
- GTK_TOOLBAR (toolbar)->tooltips,
- _("Go to previous location"), NULL);
- gtk_menu_tool_button_set_arrow_tooltip (GTK_MENU_TOOL_BUTTON
- (widget),
- GTK_TOOLBAR (toolbar)->
- tooltips,
- _("Go to a previously opened location"),
- NULL);
-
- action =
- gtk_action_group_get_action (obj->priv->action_group_sensitive,
- "DirectoryPrevious");
+ action = gtk_action_group_get_action (obj->priv->action_group_sensitive,
+ "DirectoryPrevious");
g_object_set (action, "is_important", TRUE, "short_label",
_("Previous location"), NULL);
gtk_action_connect_proxy (action, widget);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (widget),
- 0);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (widget), 0);
/* Next directory menu tool item */
obj->priv->location_next_menu = gtk_menu_new ();
gtk_widget_show (obj->priv->location_next_menu);
- widget =
- GTK_WIDGET (gtk_menu_tool_button_new_from_stock
- (GTK_STOCK_GO_FORWARD));
+ widget = GTK_WIDGET (gtk_menu_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD));
gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (widget),
obj->priv->location_next_menu);
g_object_set (widget, "label", _("Next location"), NULL);
+ gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (widget),
+ _("Go to next location"));
+ gtk_menu_tool_button_set_arrow_tooltip_text (GTK_MENU_TOOL_BUTTON (widget),
+ _("Go to a previously opened location"));
- gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (widget),
- GTK_TOOLBAR (toolbar)->tooltips,
- _("Go to next location"), NULL);
- gtk_menu_tool_button_set_arrow_tooltip (GTK_MENU_TOOL_BUTTON
- (widget),
- GTK_TOOLBAR (toolbar)->
- tooltips,
- _
- ("Go to a previously opened location"),
- NULL);
-
- action =
- gtk_action_group_get_action (obj->priv->action_group_sensitive,
- "DirectoryNext");
+ action = gtk_action_group_get_action (obj->priv->action_group_sensitive,
+ "DirectoryNext");
g_object_set (action, "is_important", TRUE, "short_label",
_("Previous location"), NULL);
gtk_action_connect_proxy (action, widget);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (widget),
- 1);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (widget), 1);
gtk_box_pack_start (GTK_BOX (obj), toolbar, FALSE, FALSE, 0);
gtk_widget_show (toolbar);
@@ -1513,13 +1495,13 @@
gtk_menu_shell_prepend (GTK_MENU_SHELL (menu_to),
widget);
- gtk_widget_unref (widget);
+ g_object_unref (widget);
}
widget = GTK_WIDGET (child->data);
/* Make sure the widget isn't destroyed when removed */
- gtk_widget_ref (widget);
+ g_object_ref (widget);
gtk_container_remove (GTK_CONTAINER (menu_from), widget);
obj->priv->current_location_menu_item = widget;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]