Commit dfc592686d277ca9d4cccecf2f63aa3eac9c3da9

Authored by Perry Werneck
1 parent 68b56ac7
Exists in master and in 1 other branch develop

Fixing property names.

src/terminal/charset.c
@@ -337,6 +337,7 @@ @@ -337,6 +337,7 @@
337 g_free(cfg.host); 337 g_free(cfg.host);
338 g_free(cfg.display); 338 g_free(cfg.display);
339 339
  340 + debug("%s=%p",__FUNCTION__,GTK_V3270_GET_CLASS(widget)->properties.remap_file);
340 g_object_notify_by_pspec(G_OBJECT(widget), GTK_V3270_GET_CLASS(widget)->properties.remap_file); 341 g_object_notify_by_pspec(G_OBJECT(widget), GTK_V3270_GET_CLASS(widget)->properties.remap_file);
341 342
342 } 343 }
src/terminal/drawing/oia.c
@@ -713,7 +713,6 @@ gboolean v3270_update_associated_lu(v3270 *terminal) @@ -713,7 +713,6 @@ gboolean v3270_update_associated_lu(v3270 *terminal)
713 v3270_queue_draw_area(GTK_WIDGET(terminal),rect->x,rect->y,rect->width,rect->height); 713 v3270_queue_draw_area(GTK_WIDGET(terminal),rect->x,rect->y,rect->width,rect->height);
714 } 714 }
715 715
716 - debug("%s(%p)",__FUNCTION__,GTK_V3270_GET_CLASS(terminal)->properties.associated_lu);  
717 g_object_notify_by_pspec(G_OBJECT(terminal), GTK_V3270_GET_CLASS(terminal)->properties.associated_lu); 716 g_object_notify_by_pspec(G_OBJECT(terminal), GTK_V3270_GET_CLASS(terminal)->properties.associated_lu);
718 717
719 return FALSE; 718 return FALSE;
src/terminal/font/properties.c
@@ -64,6 +64,8 @@ LIB3270_EXPORT void v3270_set_font_family(GtkWidget *widget, const gchar *name) @@ -64,6 +64,8 @@ LIB3270_EXPORT void v3270_set_font_family(GtkWidget *widget, const gchar *name)
64 terminal->font.weight = lib3270_get_toggle(terminal->host,LIB3270_TOGGLE_BOLD) ? CAIRO_FONT_WEIGHT_BOLD : CAIRO_FONT_WEIGHT_NORMAL; 64 terminal->font.weight = lib3270_get_toggle(terminal->host,LIB3270_TOGGLE_BOLD) ? CAIRO_FONT_WEIGHT_BOLD : CAIRO_FONT_WEIGHT_NORMAL;
65 65
66 g_signal_emit(widget,v3270_widget_signal[V3270_SIGNAL_UPDATE_CONFIG], 0, "font-family", name); 66 g_signal_emit(widget,v3270_widget_signal[V3270_SIGNAL_UPDATE_CONFIG], 0, "font-family", name);
  67 +
  68 + debug("%s: %p",__FUNCTION__,GTK_V3270_GET_CLASS(widget)->properties.font_family);
67 g_object_notify_by_pspec(G_OBJECT(widget), GTK_V3270_GET_CLASS(widget)->properties.font_family); 69 g_object_notify_by_pspec(G_OBJECT(widget), GTK_V3270_GET_CLASS(widget)->properties.font_family);
68 70
69 if(gtk_widget_get_realized(widget) && gtk_widget_get_has_window(widget)) 71 if(gtk_widget_get_realized(widget) && gtk_widget_get_has_window(widget))
src/terminal/properties/init.c
@@ -41,22 +41,20 @@ @@ -41,22 +41,20 @@
41 GParamSpec **prop; 41 GParamSpec **prop;
42 } properties[] = { 42 } properties[] = {
43 { "connected", &klass->properties.online }, 43 { "connected", &klass->properties.online },
44 - { "associated_lu", &klass->properties.associated_lu }, 44 + { "associated-lu", &klass->properties.associated_lu },
45 { "url", &klass->properties.url }, 45 { "url", &klass->properties.url },
46 - { "model_number", &klass->properties.model },  
47 - { "has_selection", &klass->properties.selection }, 46 + { "model-number", &klass->properties.model },
  47 + { "has-selection", &klass->properties.selection },
48 }; 48 };
49 49
50 size_t ix; 50 size_t ix;
51 51
52 - debug("Property %s=%u",g_param_spec_get_name(pspec),(unsigned int) property_id);  
53 g_object_class_install_property(oclass, property_id, pspec); 52 g_object_class_install_property(oclass, property_id, pspec);
54 53
55 for(ix = 0; ix < G_N_ELEMENTS(properties); ix++) 54 for(ix = 0; ix < G_N_ELEMENTS(properties); ix++)
56 { 55 {
57 if(!g_ascii_strcasecmp(properties[ix].name,g_param_spec_get_name(pspec))) 56 if(!g_ascii_strcasecmp(properties[ix].name,g_param_spec_get_name(pspec)))
58 { 57 {
59 -// debug("Property \"%s\" is special",g_param_spec_get_name(pspec));  
60 *properties[ix].prop = pspec; 58 *properties[ix].prop = pspec;
61 break; 59 break;
62 } 60 }
src/terminal/toggles.c
@@ -118,6 +118,7 @@ void v3270_update_toggle(GtkWidget *widget, LIB3270_TOGGLE_ID id, unsigned char @@ -118,6 +118,7 @@ void v3270_update_toggle(GtkWidget *widget, LIB3270_TOGGLE_ID id, unsigned char
118 118
119 } 119 }
120 120
  121 + debug("%s: pspec=%p",__FUNCTION__,klass->properties.toggle[id]);
121 g_object_notify_by_pspec(G_OBJECT(widget), klass->properties.toggle[id]); 122 g_object_notify_by_pspec(G_OBJECT(widget), klass->properties.toggle[id]);
122 g_signal_emit(widget, v3270_widget_signal[V3270_SIGNAL_TOGGLE_CHANGED], 0, (guint) id, (gboolean) (value != 0), (gchar *) name); 123 g_signal_emit(widget, v3270_widget_signal[V3270_SIGNAL_TOGGLE_CHANGED], 0, (guint) id, (gboolean) (value != 0), (gchar *) name);
123 124