From 464274dae71580b7a6ba604c23043c523f9a929c Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Thu, 8 Jun 2006 20:37:03 +0000 Subject: [PATCH] Fix merge errors. Should build now. SVN revision: 23312 --- e_mod_config.c | 33 --------------------------------- e_mod_main.c | 41 +++-------------------------------------- mail.edc | 20 -------------------- 3 files changed, 3 insertions(+), 91 deletions(-) diff --git a/e_mod_config.c b/e_mod_config.c index 47582f5..0470d36 100644 --- a/e_mod_config.c +++ b/e_mod_config.c @@ -18,7 +18,6 @@ static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -//static void _use_exec_cb_change(void *data, Evas_Object *obj); static void _load_boxes(E_Config_Dialog *cfd); static int _ilist_header_exists(Evas_Object *il, const char *name); static void _ilist_cb_selected(void *data); @@ -50,14 +49,7 @@ static void _fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata) { cfdata->show_label = ci->show_label; - //cfdata->use_exec = ci->use_exec; - - //cfdata->exec = NULL; - //if (ci->exec) - // cfdata->exec = strdup(ci->exec); - cfdata->check_time = ci->check_time; - cfdata->boxes = ci->boxes; } @@ -271,12 +263,7 @@ _cb_edit_box(void *data, void *data2) il = cfdata->il; s = e_widget_ilist_selected_label_get(il); -<<<<<<< e_mod_config.c for (l = ci->boxes; l; l = l->next) -======= - cfdata = data; - if (cfdata->type == 0) ->>>>>>> 1.5 { Config_Box *cb; @@ -288,7 +275,6 @@ _cb_edit_box(void *data, void *data2) break; } } -<<<<<<< e_mod_config.c } static void @@ -310,25 +296,6 @@ _cb_del_box(void *data, void *data2) s = e_widget_ilist_selected_label_get(il); for (l = ci->boxes; l; l = l->next) -======= - else if (cfdata->type == 1) - { - e_widget_disabled_set(cfdata->new_path_label, 0); - e_widget_disabled_set(cfdata->new_path_entry, 0); - e_widget_disabled_set(cfdata->cur_path_label, 1); - e_widget_disabled_set(cfdata->cur_path_entry, 1); - e_widget_entry_text_set(cfdata->cur_path_entry, ""); - } - else if (cfdata->type == 3) - { - e_widget_disabled_set(cfdata->new_path_label, 0); - e_widget_disabled_set(cfdata->new_path_entry, 0); - e_widget_disabled_set(cfdata->cur_path_label, 1); - e_widget_disabled_set(cfdata->cur_path_entry, 1); - e_widget_entry_text_set(cfdata->cur_path_entry, ""); - } - else if (cfdata->type == 2) ->>>>>>> 1.5 { Config_Box *cb; diff --git a/e_mod_main.c b/e_mod_main.c index 123b017..8461211 100644 --- a/e_mod_main.c +++ b/e_mod_main.c @@ -656,13 +656,6 @@ _mail_parse_pop(void *data, void *data2) if (!ev) return; if ((!mb->server) || (mb->server != ev->server)) return; -<<<<<<< e_mod_main.c -======= - if ((!inst->server) || (inst->server != ev->server)) return; - - ci = _mail_config_item_get(inst->gcc->id); - ->>>>>>> 1.10 len = sizeof(in) -1; len = (((len) > (ev->size)) ? ev->size : len); memcpy(in, ev->data, len); @@ -758,13 +751,6 @@ _mail_parse_imap(void *data, void *data2) if (!ev) return; if ((!mb->server) || (mb->server != ev->server)) return; -<<<<<<< e_mod_main.c -======= - if ((!inst->server) || (inst->server != ev->server)) return; - - ci = _mail_config_item_get(inst->gcc->id); - ->>>>>>> 1.10 len = sizeof(in) -1; len = (((len) > (ev->size)) ? ev->size : len); memcpy(in, ev->data, len); @@ -936,21 +922,10 @@ _mail_set_text(void *data) inst = data; if (!inst) return; - edje_object_part_text_set(inst->mail->mail_obj, "name", ""); - -<<<<<<< e_mod_main.c - snprintf(buf, sizeof(buf), "New: 0"); -======= - snprintf(buf, sizeof(buf), "%d/%d", n, t); ->>>>>>> 1.10 - edje_object_part_text_set(inst->mail->mail_obj, "new_label", buf); -<<<<<<< e_mod_main.c + edje_object_part_text_set(inst->mail->mail_obj, "name", ""); + edje_object_signal_emit(inst->mail->mail_obj, "no_mail", ""); + edje_object_part_text_set(inst->mail->mail_obj, "new_label", ""); - snprintf(buf, sizeof(buf), "Total: 0"); - edje_object_part_text_set(inst->mail->mail_obj, "total_label", buf); - - edje_object_signal_emit(inst->mail->mail_obj, "no_mail", ""); - for (l = inst->mboxes; l; l = l->next) { Mailbox *mb; @@ -965,21 +940,11 @@ _mail_set_text(void *data) snprintf(buf, sizeof(buf), "New: %d", mb->num_new); edje_object_part_text_set(inst->mail->mail_obj, "new_label", buf); - snprintf(buf, sizeof(buf), "Total: %d", mb->num_total); - edje_object_part_text_set(inst->mail->mail_obj, "total_label", buf); - edje_object_signal_emit(inst->mail->mail_obj, "new_mail", ""); break; } } -======= - - if (n > 0) - edje_object_signal_emit(inst->mail->mail_obj, "new_mail", ""); - else - edje_object_signal_emit(inst->mail->mail_obj, "no_mail", ""); ->>>>>>> 1.10 } static int diff --git a/mail.edc b/mail.edc index 00a696b..88846ff 100644 --- a/mail.edc +++ b/mail.edc @@ -144,7 +144,6 @@ collections } text { -<<<<<<< mail.edc text: ""; font: "VeraBold"; size: 9; @@ -162,25 +161,6 @@ collections color3: 255 255 255 42; } } -======= - text: "New:"; - font: "VeraBold"; - size: 9; - min: 1 1; - align: 1.0 0.5; - text_class: "module_small"; - } - } - description - { - state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 0 0 0 255; - color3: 255 255 255 42; - } - } ->>>>>>> 1.4 } programs {