From 07b4b24bacfc227ccd63df56a0ee7734ececd4fd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20Jard=C3=B3n?= Date: Tue, 12 Jan 2010 17:20:00 +0100 Subject: [PATCH] Remove some deprecated GTK+ symbols https://bugs.maemo.org/show_bug.cgi?id=4834 --- src/hildon2/modest-platform.c | 4 ++-- src/modest-ui-actions.c | 2 +- src/widgets/modest-account-view.c | 2 +- src/widgets/modest-gtkhtml-msg-view.c | 6 ++---- src/widgets/modest-progress-bar.c | 3 ++- src/widgets/modest-validating-entry.c | 11 ++++------- 6 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c index 5bed31f..6b57a1d 100644 --- a/src/hildon2/modest-platform.c +++ b/src/hildon2/modest-platform.c @@ -662,7 +662,7 @@ on_response (GtkDialog *dialog, hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (dialog)), NULL, _CS_FOLDER_ALREADY_EXISTS); /* Select the text */ - gtk_entry_select_region (GTK_ENTRY (entry), 0, -1); + gtk_editable_select_region (GTK_EDITABLE (entry), 0, -1); gtk_widget_grab_focus (entry); /* Do not close the dialog */ g_signal_stop_emission_by_name (dialog, "response"); @@ -1044,7 +1044,7 @@ modest_platform_run_folder_common_dialog (GtkWindow *parent_window, gtk_entry_set_width_chars (GTK_ENTRY (entry), MAX (g_utf8_strlen (gtk_entry_get_text (GTK_ENTRY (entry)), -1), g_utf8_strlen (_FM_NEW_FOLDER_NAME_STUB, -1))); - gtk_entry_select_region (GTK_ENTRY (entry), 0, -1); + gtk_editable_select_region (GTK_EDITABLE (entry), 0, -1); } if (show_parent) { diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index ccd14e6..4933688 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -265,7 +265,7 @@ modest_ui_actions_on_about (GtkAction *action, ModestWindow *win) NULL }; about = gtk_about_dialog_new (); - gtk_about_dialog_set_name (GTK_ABOUT_DIALOG(about), PACKAGE_NAME); + gtk_about_dialog_set_program_name (GTK_ABOUT_DIALOG(about), PACKAGE_NAME); gtk_about_dialog_set_version (GTK_ABOUT_DIALOG(about),PACKAGE_VERSION); gtk_about_dialog_set_copyright (GTK_ABOUT_DIALOG(about), _("Copyright (c) 2006, Nokia Corporation\n" diff --git a/src/widgets/modest-account-view.c b/src/widgets/modest-account-view.c index a74b561..cf07ff6 100644 --- a/src/widgets/modest-account-view.c +++ b/src/widgets/modest-account-view.c @@ -823,7 +823,7 @@ update_display_mode (ModestAccountView *self) /* Name column */ column = gtk_tree_view_get_column (GTK_TREE_VIEW (self), 1); - renderers = gtk_tree_view_column_get_cell_renderers (column); + renderers = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (column)); renderer = (GtkCellRenderer *) renderers->data; g_object_set (renderer, "align-set", TRUE, diff --git a/src/widgets/modest-gtkhtml-msg-view.c b/src/widgets/modest-gtkhtml-msg-view.c index 48f414f..667281f 100644 --- a/src/widgets/modest-gtkhtml-msg-view.c +++ b/src/widgets/modest-gtkhtml-msg-view.c @@ -1441,8 +1441,7 @@ set_hadjustment (ModestGtkhtmlMsgView *self, GtkAdjustment *hadj) if (!hadj) hadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0,0.0,0.0,0.0,0.0,0.0)); disconnect_hadjustment (self); - g_object_ref (G_OBJECT (hadj)); - gtk_object_sink (GTK_OBJECT (hadj)); + g_object_ref_sink (G_OBJECT (hadj)); priv->hadj = hadj; set_hadjustment_values (self, &value_changed); @@ -1470,8 +1469,7 @@ set_vadjustment (ModestGtkhtmlMsgView *self, GtkAdjustment *vadj) if (!vadj) vadj = (GtkAdjustment *) gtk_adjustment_new (0.0,0.0,0.0,0.0,0.0,0.0); disconnect_vadjustment (self); - g_object_ref (G_OBJECT (vadj)); - gtk_object_sink (GTK_OBJECT (vadj)); + g_object_ref_sink (G_OBJECT (vadj)); priv->vadj = vadj; set_vadjustment_values (self, &value_changed); diff --git a/src/widgets/modest-progress-bar.c b/src/widgets/modest-progress-bar.c index 1361f41..5e3e03b 100644 --- a/src/widgets/modest-progress-bar.c +++ b/src/widgets/modest-progress-bar.c @@ -181,7 +181,8 @@ modest_progress_bar_init (ModestProgressBar *self) /* Build GtkProgressBar */ adj = (GtkAdjustment *) gtk_adjustment_new (0, LOWER, UPPER, 0, 0, 0); - priv->progress_bar = gtk_progress_bar_new_with_adjustment (adj); + priv->progress_bar = gtk_progress_bar_new (); + g_object_set (priv->progress_bar, "adjustment", adj, NULL); req.width = 228; req.height = 64; gtk_progress_set_text_alignment (GTK_PROGRESS (priv->progress_bar), 0, 0.5); diff --git a/src/widgets/modest-validating-entry.c b/src/widgets/modest-validating-entry.c index 6d34d6c..24cca53 100644 --- a/src/widgets/modest-validating-entry.c +++ b/src/widgets/modest-validating-entry.c @@ -29,7 +29,6 @@ #include "modest-validating-entry.h" #include -#include /* For the gtk_signal_stop_emit_by_name() convenience function. */ #include /* For strlen(). */ /* Include config.h so that _() works: */ @@ -209,12 +208,10 @@ on_insert_text(GtkEditable *editable, } if(!allow) { - /* The signal documentation says - * "by connecting to this signal and then stopping the signal with - * gtk_signal_emit_stop(), it is possible to modify the inserted text, - * or prevent it from being inserted entirely." - */ - gtk_signal_emit_stop_by_name (GTK_OBJECT (self), "insert-text"); + /* The signal documentation says: */ + /* "by connecting to this signal and then stopping the signal with */ + /* g_signal_stop_emission(), it is possible to modify the inserted text, */ + g_signal_stop_emission_by_name (self, "insert-text"); } } -- 1.7.9.5