diff options
Diffstat (limited to 'plugins/gtk+/glade-accels.c')
-rw-r--r-- | plugins/gtk+/glade-accels.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/plugins/gtk+/glade-accels.c b/plugins/gtk+/glade-accels.c index 989c1ff8..71bfc4d7 100644 --- a/plugins/gtk+/glade-accels.c +++ b/plugins/gtk+/glade-accels.c @@ -201,7 +201,7 @@ glade_eprop_accel_populate_view (GladeEditorProperty * eprop, GtkTreeView * view) { GladeEPropAccel *eprop_accel = GLADE_EPROP_ACCEL (eprop); - GladeSignalClass *sclass; + GladeSignalDef *sdef; GladePropertyClass *pclass = glade_editor_property_get_pclass (eprop); GladeProperty *property = glade_editor_property_get_property (eprop); GladeWidgetAdaptor *adaptor = glade_property_class_get_adaptor (pclass); @@ -222,32 +222,32 @@ G_GNUC_END_IGNORE_DEPRECATIONS */ for (list = glade_widget_adaptor_get_signals (adaptor); list; list = list->next) { - sclass = list->data; + sdef = list->data; /* Special case for GtkAction accelerators */ if (glade_widget_adaptor_get_object_type (adaptor) == type_action || g_type_is_a (glade_widget_adaptor_get_object_type (adaptor), type_action)) { - if (g_strcmp0 (glade_signal_class_get_object_type_name (sclass), "GtkAction") != 0 || - g_strcmp0 (glade_signal_class_get_name (sclass), "activate") != 0) + if (g_strcmp0 (glade_signal_def_get_object_type_name (sdef), "GtkAction") != 0 || + g_strcmp0 (glade_signal_def_get_name (sdef), "activate") != 0) continue; } /* Only action signals have accelerators. */ - else if ((glade_signal_class_get_flags (sclass) & G_SIGNAL_ACTION) == 0) + else if ((glade_signal_def_get_flags (sdef) & G_SIGNAL_ACTION) == 0) continue; if (g_list_find_custom (eprop_accel->parent_iters, - glade_signal_class_get_object_type_name (sclass), + glade_signal_def_get_object_type_name (sdef), (GCompareFunc) eprop_find_iter) == NULL) { gtk_tree_store_append (model, &iter, NULL); gtk_tree_store_set (model, &iter, - ACCEL_COLUMN_SIGNAL, glade_signal_class_get_object_type_name (sclass), + ACCEL_COLUMN_SIGNAL, glade_signal_def_get_object_type_name (sdef), ACCEL_COLUMN_WEIGHT, PANGO_WEIGHT_BOLD, ACCEL_COLUMN_VISIBLE, FALSE, -1); parent_tab = g_new0 (GladeEpropIterTab, 1); - parent_tab->name = glade_signal_class_get_object_type_name (sclass); + parent_tab->name = glade_signal_def_get_object_type_name (sdef); parent_tab->iter = gtk_tree_iter_copy (&iter); eprop_accel->parent_iters = @@ -259,26 +259,26 @@ G_GNUC_END_IGNORE_DEPRECATIONS */ for (list = glade_widget_adaptor_get_signals (adaptor); list; list = list->next) { - sclass = list->data; + sdef = list->data; /* Special case for GtkAction accelerators */ if (glade_widget_adaptor_get_object_type (adaptor) == type_action || g_type_is_a (glade_widget_adaptor_get_object_type (adaptor), type_action)) { - if (g_strcmp0 (glade_signal_class_get_object_type_name (sclass), "GtkAction") != 0 || - g_strcmp0 (glade_signal_class_get_name (sclass), "activate") != 0) + if (g_strcmp0 (glade_signal_def_get_object_type_name (sdef), "GtkAction") != 0 || + g_strcmp0 (glade_signal_def_get_name (sdef), "activate") != 0) continue; } /* Only action signals have accelerators. */ - else if ((glade_signal_class_get_flags (sclass) & G_SIGNAL_ACTION) == 0) + else if ((glade_signal_def_get_flags (sdef) & G_SIGNAL_ACTION) == 0) continue; if ((found = g_list_find_custom (eprop_accel->parent_iters, - glade_signal_class_get_object_type_name (sclass), + glade_signal_def_get_object_type_name (sdef), (GCompareFunc) eprop_find_iter)) != NULL) { parent_tab = found->data; - name = g_strdup_printf (" %s", glade_signal_class_get_name (sclass)); + name = g_strdup_printf (" %s", glade_signal_def_get_name (sdef)); /* Populate from accelerator list */ @@ -286,7 +286,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS { info = l->data; - if (g_strcmp0 (info->signal, glade_signal_class_get_name (sclass))) + if (g_strcmp0 (info->signal, glade_signal_def_get_name (sdef))) continue; accel_text = gtk_accelerator_name (info->key, info->modifiers); @@ -295,7 +295,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS gtk_tree_store_set (model, &iter, ACCEL_COLUMN_SIGNAL, name, - ACCEL_COLUMN_REAL_SIGNAL, glade_signal_class_get_name (sclass), + ACCEL_COLUMN_REAL_SIGNAL, glade_signal_def_get_name (sdef), ACCEL_COLUMN_TEXT, accel_text, ACCEL_COLUMN_WEIGHT, PANGO_WEIGHT_NORMAL, ACCEL_COLUMN_STYLE, PANGO_STYLE_NORMAL, @@ -319,7 +319,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS gtk_tree_store_set (model, &iter, ACCEL_COLUMN_SIGNAL, name, - ACCEL_COLUMN_REAL_SIGNAL, glade_signal_class_get_name (sclass), + ACCEL_COLUMN_REAL_SIGNAL, glade_signal_def_get_name (sdef), ACCEL_COLUMN_TEXT, _("<choose a key>"), ACCEL_COLUMN_WEIGHT, PANGO_WEIGHT_NORMAL, ACCEL_COLUMN_STYLE, PANGO_STYLE_ITALIC, |