diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/e-mail-attachment-bar.c | 4 | ||||
| -rw-r--r-- | mail/em-account-editor.c | 9 | ||||
| -rw-r--r-- | mail/em-filter-rule.c | 4 | ||||
| -rw-r--r-- | mail/em-folder-tree.c | 2 | ||||
| -rw-r--r-- | mail/em-format-html-display.c | 2 |
5 files changed, 11 insertions, 10 deletions
diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c index 0ffe287306..f603b719e4 100644 --- a/mail/e-mail-attachment-bar.c +++ b/mail/e-mail-attachment-bar.c @@ -546,7 +546,7 @@ mail_attachment_bar_init (EMailAttachmentBar *bar) container = widget; widget = e_attachment_icon_view_new (); - GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS); + gtk_widget_set_can_focus (widget, TRUE); gtk_icon_view_set_model (GTK_ICON_VIEW (widget), bar->priv->model); gtk_container_add (GTK_CONTAINER (container), widget); bar->priv->icon_view = g_object_ref (widget); @@ -563,7 +563,7 @@ mail_attachment_bar_init (EMailAttachmentBar *bar) container = widget; widget = e_attachment_tree_view_new (); - GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS); + gtk_widget_set_can_focus (widget, TRUE); gtk_tree_view_set_model (GTK_TREE_VIEW (widget), bar->priv->model); gtk_container_add (GTK_CONTAINER (container), widget); bar->priv->tree_view = g_object_ref (widget); diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index d3158fb48d..702e63e723 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -2483,7 +2483,7 @@ emae_receive_options_item (EConfig *ec, EConfigItem *item, GtkWidget *parent, Gt { EMAccountEditor *emae = data; GtkWidget *w, *box, *spin; - gint row; + guint row; if (emae->priv->source.provider == NULL || emae->priv->source.provider->extra_conf == NULL) @@ -2509,7 +2509,7 @@ emae_receive_options_item (EConfig *ec, EConfigItem *item, GtkWidget *parent, Gt } /* We have to add the automatic mail check item with the rest of the receive options */ - row = ((GtkTable *)parent)->nrows; + g_object_get (parent, "n-rows", &row, NULL); box = gtk_hbox_new (FALSE, 4); w = gtk_check_button_new_with_mnemonic (_("Check for _new messages every")); @@ -2541,7 +2541,8 @@ emae_receive_options_extra_item (EConfig *ec, EConfigItem *eitem, GtkWidget *par GtkWidget *depw; GSList *depl = NULL, *n; EMAccountEditorService *service = &emae->priv->source; - gint row, i; + gint i; + guint row; GHashTable *extra; CamelURL *url; @@ -2569,7 +2570,7 @@ section: url = emae_account_url (emae, emae_service_info[service->type].account_uri_key); item->extra_table = g_hash_table_new (g_str_hash, g_str_equal); extra = g_hash_table_new (g_str_hash, g_str_equal); - row = ((GtkTable *)parent)->nrows; + g_object_get (parent, "n-rows", &row, NULL); for (;entries[i].type != CAMEL_PROVIDER_CONF_END && entries[i].type != CAMEL_PROVIDER_CONF_SECTION_END;i++) { if (entries[i].depname) { diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c index ce73d2024f..b8ae4d66d7 100644 --- a/mail/em-filter-rule.c +++ b/mail/em-filter-rule.c @@ -480,13 +480,13 @@ more_parts(GtkWidget *button, struct _rule_data *data) new = em_filter_context_next_action((EMFilterContext *)data->f, NULL); if (new) { GtkWidget *w; - guint16 rows; + guint rows; new = e_filter_part_clone(new); em_filter_rule_add_action((EMFilterRule *)data->fr, new); w = get_rule_part_widget(data->f, new, data->fr); - rows = GTK_TABLE(data->parts)->nrows; + g_object_get (data->parts, "n-rows", &rows, NULL); gtk_table_resize(GTK_TABLE(data->parts), rows + 1, 2); attach_rule(w, data, new, rows); diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index 7a8f7be744..622c9c1389 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -1149,7 +1149,7 @@ folder_tree_new (EMFolderTree *folder_tree) /* FIXME Gross hack */ tree = GTK_WIDGET (folder_tree); - GTK_WIDGET_SET_FLAGS(tree, GTK_CAN_FOCUS); + gtk_widget_set_can_focus (tree, TRUE); column = gtk_tree_view_column_new (); gtk_tree_view_append_column ((GtkTreeView *) tree, column); diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index cca924ac9f..a0a6c6ecc1 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -999,7 +999,7 @@ efhd_attachment_optional(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPOb g_signal_connect(G_OBJECT (button), "clicked", G_CALLBACK(efhd_optional_button_show), scroll); else { gtk_widget_set_sensitive(button, FALSE); - GTK_WIDGET_UNSET_FLAGS(button, GTK_CAN_FOCUS); + gtk_widget_set_can_focus (button, FALSE); } vbox = gtk_vbox_new (FALSE, 0); |