summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVasily_Makarov <danilka.pro@gmail.com>2012-01-31 19:43:08 +0400
committerVasily_Makarov <danilka.pro@gmail.com>2012-01-31 19:43:08 +0400
commit0c9df28b0a3f7d3576f9cbe6df8233b7883abe71 (patch)
tree312fec35680a1b58eca1f9c54eec39366ae78529
parente0e931518b1e5072749e2f2db768a9f0ed899d30 (diff)
downloadevol-tools-0c9df28b0a3f7d3576f9cbe6df8233b7883abe71.tar.gz
evol-tools-0c9df28b0a3f7d3576f9cbe6df8233b7883abe71.tar.bz2
evol-tools-0c9df28b0a3f7d3576f9cbe6df8233b7883abe71.tar.xz
evol-tools-0c9df28b0a3f7d3576f9cbe6df8233b7883abe71.zip
Some changes
-rw-r--r--saedit/interface.ui14
-rw-r--r--saedit/main.c2
2 files changed, 15 insertions, 1 deletions
diff --git a/saedit/interface.ui b/saedit/interface.ui
index 69c52fd..4141f93 100644
--- a/saedit/interface.ui
+++ b/saedit/interface.ui
@@ -198,6 +198,18 @@ Reid Yaro &lt;reidyaro@gmail.com&gt;</property>
<column type="gchararray"/>
</columns>
</object>
+ <object class="GtkListStore" id="liststore2">
+ <columns>
+ <!-- column-name text -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkListStore" id="liststore3">
+ <columns>
+ <!-- column-name text -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
<object class="GtkWindow" id="win_main">
<property name="width_request">600</property>
<property name="height_request">600</property>
@@ -553,6 +565,7 @@ Reid Yaro &lt;reidyaro@gmail.com&gt;</property>
<object class="GtkComboBoxText" id="actionscbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="model">liststore2</property>
<property name="active">0</property>
<signal name="changed" handler="actions_combo_box_changed_callback" swapped="no"/>
</object>
@@ -581,6 +594,7 @@ Reid Yaro &lt;reidyaro@gmail.com&gt;</property>
<object class="GtkComboBoxText" id="animationscbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="model">liststore3</property>
<property name="active">0</property>
<signal name="changed" handler="animations_combo_box_changed_callback" swapped="no"/>
</object>
diff --git a/saedit/main.c b/saedit/main.c
index b0f1b3b..adce108 100644
--- a/saedit/main.c
+++ b/saedit/main.c
@@ -282,7 +282,7 @@ void set_up_actions_by_imageset_name(gchar *imageset_name, SAEInfo *sae_info) {
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sae_info->actions_combo_box), xml_node_get_attr_value(node, "name"));
list = list->next;
}
- if (sae_info->actions_combo_box != NULL);
+ if (sae_info->actions_combo_box != NULL)
gtk_combo_box_set_active(GTK_COMBO_BOX(sae_info->actions_combo_box), 0);
}