aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIain Holmes <iain@src.gnome.org>2002-06-27 00:07:40 +0800
committerIain Holmes <iain@src.gnome.org>2002-06-27 00:07:40 +0800
commit6bb5b8850a6202012fe8f7b1ea0295aeab4112ba (patch)
tree287fe93359b371d5775d3e3120cc4087e3ac7d12
parent9a210db24ffc2e0d806c5afda8cf3b471aa4d5c3 (diff)
downloadgsoc2013-evolution-6bb5b8850a6202012fe8f7b1ea0295aeab4112ba.tar.gz
gsoc2013-evolution-6bb5b8850a6202012fe8f7b1ea0295aeab4112ba.tar.zst
gsoc2013-evolution-6bb5b8850a6202012fe8f7b1ea0295aeab4112ba.zip
Sort the states in the right order
svn path=/trunk/; revision=17291
-rw-r--r--my-evolution/ChangeLog8
-rw-r--r--my-evolution/e-summary-shown.c5
-rw-r--r--my-evolution/e-summary-weather.c7
3 files changed, 12 insertions, 8 deletions
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index 29c95028d4..9c39bce42c 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,5 +1,13 @@
2002-06-26 Iain <iain@ximian.com>
+ * e-summary-weather.c (e_summary_weather_fill_etable): Count the
+ states from 0 up.
+
+ * e-summary-shown.c (e_summary_shown_append): Use -1 instead of the
+ children count.
+
+2002-06-26 Iain <iain@ximian.com>
+
* component-factory.c (owner_set_cb): Pass the shell.
* e-summary-mail.c (new_folder_cb): Use the ESummaryPrefsFolder stuff.
diff --git a/my-evolution/e-summary-shown.c b/my-evolution/e-summary-shown.c
index 92c2d3102e..f66b5c7512 100644
--- a/my-evolution/e-summary-shown.c
+++ b/my-evolution/e-summary-shown.c
@@ -581,14 +581,11 @@ e_tree_model_node_append (ETreeModel *etm,
gpointer data)
{
ETreeMemory *etmm;
- int position;
ETreePath path;
- position = e_tree_model_node_get_children (etm, parent, NULL);
-
etmm = E_TREE_MEMORY (etm);
e_tree_memory_freeze (etmm);
- path = e_tree_memory_node_insert (etmm, parent, position, data);
+ path = e_tree_memory_node_insert (etmm, parent, -1, data);
e_tree_memory_thaw (etmm);
return path;
diff --git a/my-evolution/e-summary-weather.c b/my-evolution/e-summary-weather.c
index c5396e7225..2be84faec6 100644
--- a/my-evolution/e-summary-weather.c
+++ b/my-evolution/e-summary-weather.c
@@ -701,7 +701,7 @@ e_summary_weather_fill_etable (ESummaryShown *ess)
gnome_config_get_vector (states_key, &nstates, &states);
state = NULL;
- for (istates = nstates - 1; istates >= 0; istates--) {
+ for (istates = 0; istates < nstates; istates++) {
void *iter;
char *iter_key, *iter_val;
char *state_path, *state_name_key, *state_name;
@@ -721,10 +721,10 @@ e_summary_weather_fill_etable (ESummaryShown *ess)
iter = gnome_config_init_iterator (state_path);
while ((iter = gnome_config_iterator_next (iter, &iter_key, &iter_val)) != NULL) {
- if (strstr (iter_key, "loc") != NULL) {
+ if (strncmp (iter_key, "loc", 3) == 0) {
char **locdata;
int nlocdata;
-
+
gnome_config_make_vector (iter_val,
&nlocdata,
&locdata);
@@ -736,7 +736,6 @@ e_summary_weather_fill_etable (ESummaryShown *ess)
entry->showable = TRUE;
location = e_summary_shown_add_node (ess, TRUE, entry, state, TRUE, NULL);
- /* FIXME: Show the showns here */
if (is_weather_shown (locdata[1]) == TRUE) {
entry = g_new (ESummaryShownModelEntry, 1);
entry->location = g_strdup (locdata[1]);