Commit 154e0036c78aadf63c14590f1c0026bf2eca2ead
1 parent
3b55c2c7
Exists in
master
and in
4 other branches
Adding font-family action.
Showing
2 changed files
with
11 additions
and
8 deletions
Show diff stats
src/objects/actions/abstract.c
| @@ -333,18 +333,18 @@ | @@ -333,18 +333,18 @@ | ||
| 333 | g_idle_add((GSourceFunc) bg_notify_state, G_OBJECT(action)); | 333 | g_idle_add((GSourceFunc) bg_notify_state, G_OBJECT(action)); |
| 334 | } | 334 | } |
| 335 | 335 | ||
| 336 | - static void change_widget(GAction *action, GtkWidget *from, GtkWidget *to) { | 336 | + static void change_widget(GAction *object, GtkWidget *from, GtkWidget *to) { |
| 337 | 337 | ||
| 338 | if(from != to) { | 338 | if(from != to) { |
| 339 | 339 | ||
| 340 | - pw3270Action *pAction = PW3270_ACTION(action); | 340 | + pw3270Action *action = PW3270_ACTION(object); |
| 341 | 341 | ||
| 342 | - pAction->terminal = to; | 342 | + action->terminal = to; |
| 343 | 343 | ||
| 344 | - pw3270_action_notify_enabled(action); | 344 | + pw3270_action_notify_enabled(object); |
| 345 | 345 | ||
| 346 | - if(pAction->types.state) | ||
| 347 | - pw3270_action_notify_state(action); | 346 | + if(action->types.state) |
| 347 | + pw3270_action_notify_state(object); | ||
| 348 | 348 | ||
| 349 | } | 349 | } |
| 350 | 350 |
src/objects/actions/v3270/property.c
| @@ -76,6 +76,7 @@ | @@ -76,6 +76,7 @@ | ||
| 76 | 76 | ||
| 77 | case G_TYPE_STRING: | 77 | case G_TYPE_STRING: |
| 78 | result = g_variant_new_string(g_value_get_string(&value)); | 78 | result = g_variant_new_string(g_value_get_string(&value)); |
| 79 | + debug("Action %s is on state \"%s\"",g_action_get_name(object),g_value_get_string(&value)); | ||
| 79 | break; | 80 | break; |
| 80 | 81 | ||
| 81 | case G_TYPE_BOOLEAN: | 82 | case G_TYPE_BOOLEAN: |
| @@ -139,6 +140,10 @@ | @@ -139,6 +140,10 @@ | ||
| 139 | 140 | ||
| 140 | break; | 141 | break; |
| 141 | 142 | ||
| 143 | + case G_TYPE_STRING: | ||
| 144 | + g_value_set_string(&value,g_variant_get_string(parameter,NULL)); | ||
| 145 | + break; | ||
| 146 | + | ||
| 142 | /* | 147 | /* |
| 143 | case G_TYPE_INT: | 148 | case G_TYPE_INT: |
| 144 | break; | 149 | break; |
| @@ -149,8 +154,6 @@ | @@ -149,8 +154,6 @@ | ||
| 149 | case G_TYPE_FLOAT: | 154 | case G_TYPE_FLOAT: |
| 150 | break; | 155 | break; |
| 151 | 156 | ||
| 152 | - case G_TYPE_STRING: | ||
| 153 | - break; | ||
| 154 | */ | 157 | */ |
| 155 | 158 | ||
| 156 | default: | 159 | default: |