summaryrefslogtreecommitdiffstats
path: root/friendfinder
diff options
context:
space:
mode:
authorPatrick Hornecker2010-01-08 11:46:53 +0100
committerPatrick Hornecker2010-01-08 11:46:53 +0100
commit48ee2633c01d16714919321a189c5f7e2dc0f3e9 (patch)
tree5910823a4fb6fd36340b0f9212f1c4e9971e6e87 /friendfinder
parentoptions implemented (diff)
downloadfriendfinder-48ee2633c01d16714919321a189c5f7e2dc0f3e9.tar.gz
friendfinder-48ee2633c01d16714919321a189c5f7e2dc0f3e9.tar.xz
friendfinder-48ee2633c01d16714919321a189c5f7e2dc0f3e9.zip
few bugs removed
Diffstat (limited to 'friendfinder')
-rw-r--r--friendfinder/bugs4
-rw-r--r--friendfinder/gui.c36
-rw-r--r--friendfinder/receiver.c6
3 files changed, 14 insertions, 32 deletions
diff --git a/friendfinder/bugs b/friendfinder/bugs
index 56be5ba..cefb369 100644
--- a/friendfinder/bugs
+++ b/friendfinder/bugs
@@ -3,9 +3,9 @@ receiver.c:
-> pointer zeigt immer auf gleiche variable....damit wird immer gleicher from wert genutzt und _r _s angehängt....fixen
gui.c:
- -> absturz wenn man über oberes panel zu chat wechseln will
+ -> unregelmässiger absturz beim zeichnen einer neuen bubble (enlightenment probs???)
msg_sender.c:
- -> dcc_chat wird nich akzeptiert und somit nich initziiert
+ -> dcc_chat wird nich akzeptiert und somit nich iniziiert
diff --git a/friendfinder/gui.c b/friendfinder/gui.c
index 203662d..a4fc013 100644
--- a/friendfinder/gui.c
+++ b/friendfinder/gui.c
@@ -23,8 +23,6 @@ int bubble_pos = 100;
double current_lat = 47.996578;
double current_lon = 7.840171;
-time_t now;
-
const char *msg_text, *ip = NULL, *nickname = NULL, *partner_nickname = NULL;
char *from = NULL, *to = NULL, *current_msg, *last_msg;
@@ -32,7 +30,6 @@ static Evas_Object *win, *bbx, *map;
static void on_cancel(void *data, Evas_Object *obj, void *event_info)
{
- /* cleanly exit */
elm_exit();
elm_shutdown();
close_threads();
@@ -46,8 +43,6 @@ static void on_own_position(void *data, Evas_Object *obj, void *event_info)
static void set_distance(void *data, Evas_Object *obj, void *event_info)
{
set_dist((int) data);
- //get_own_position(map);
-
}
static void on_ip(void *data, Evas_Object *obj, void *event_info)
@@ -101,9 +96,9 @@ static void set_partner_nickname(void *data, Evas_Object *obj, void *event_info)
static void on_chat(void *data, Evas_Object *obj, void *event_info)
{
+ bubble_pos = 100;
disable_map_bubbles();
init_window_parts();
- init_buttons(obj);
init_toolbar(obj);
}
@@ -112,6 +107,7 @@ static void on_map(void *data, Evas_Object *obj, void *event_info)
init_map();
enable_map_bubbles();
init_draw_user(win, map);
+ init_toolbar(obj);
}
static void on_options(void *data, Evas_Object *obj, void *event_info)
@@ -161,7 +157,6 @@ static void on_send_message(void *data, Evas_Object *bx3, void *event_info)
return;
}
- // printf("position: %d\n", bubble_pos);
if (first == 2)
{
@@ -222,17 +217,7 @@ void show_message(char *current_msg)
}
}
-/* returns the current system time */
-char* get_current_time()
-{
- time_t now;
- time(&now);
- char *text = ctime(&now);
- return text;
-}
-
-
-/* sets the username, time-text and the text in the bubble */
+/* sets the username and the text in the bubble */
void set_bubble_text(Evas_Object *bb, char *username, char *text)
{
Evas_Object *cn;
@@ -240,9 +225,6 @@ void set_bubble_text(Evas_Object *bb, char *username, char *text)
/* sets the username */
elm_entry_entry_set(bb, username);
- /* get time string and set it */
- elm_bubble_info_set(bb, get_current_time());
-
/* create entry */
cn = elm_entry_add(bb);
elm_entry_entry_set(cn, text);
@@ -529,7 +511,7 @@ void init_options()
void init_map()
{
- Evas_Object *bg, *bx, *bx2, *bx3, *bt, *bt2, *bt3;
+ Evas_Object *bg, *bx, *bx2, *bt, *bt2, *bt3;
struct polyline *pl = polyline_empty();
polyline_set_color(pl, 255, 0, 0, 50);
polyline_set_width(pl, 10);
@@ -560,8 +542,8 @@ void init_map()
e_smart_map_set_theme(map, "themes/map.edj", "main");
e_smart_map_set_pos(map, current_lat, current_lon);
// e_smart_map_set_pos(map, 47.996578, 7.840171);
- evas_object_size_hint_min_set(map, w-2, h-10*8-60);
- evas_object_size_hint_max_set(map, w-2, h-10*8-120);
+ evas_object_size_hint_min_set(map, w-2, h-10*8-80);
+ evas_object_size_hint_max_set(map, w-2, h-10*8-80);
evas_object_resize(map, w, h*0.65);
elm_box_pack_end(bx2, map);
evas_object_show(map);
@@ -591,7 +573,7 @@ void init_map()
evas_object_show(bt3);
}
-void init_buttons(Evas_Object *box)
+void init_buttons(Evas_Object *bx)
{
Evas_Object *bt1, *bt2;
@@ -600,7 +582,7 @@ void init_buttons(Evas_Object *box)
elm_button_label_set(bt1, "Send Message");
evas_object_size_hint_weight_set(bt1, 1.0, 1.0);
evas_object_size_hint_align_set(bt1, -1.0, -1.0);
- elm_box_pack_end(box, bt1);
+ elm_box_pack_end(bx, bt1);
evas_object_show(bt1);
/* and when clicked - run "on_ok" */
@@ -612,7 +594,7 @@ void init_buttons(Evas_Object *box)
elm_button_label_set(bt2, "Cancel");
evas_object_size_hint_weight_set(bt2, 1.0, 1.0);
evas_object_size_hint_align_set(bt2, -1.0, -1.0);
- elm_box_pack_end(box, bt2);
+ elm_box_pack_end(bx, bt2);
evas_object_show(bt2);
/* and when clicked - run "on_cancel" */
diff --git a/friendfinder/receiver.c b/friendfinder/receiver.c
index 7497458..b0d74a0 100644
--- a/friendfinder/receiver.c
+++ b/friendfinder/receiver.c
@@ -115,13 +115,13 @@ void receiver_main(void *user)
callbacks.event_channel = get_position;
callbacks.event_connect = on_connect_receiver;
- char *username = (char*) user;
+ char* username = (char*) user;
if (receiver_server_ip != NULL)
{
//TODO pointer zeigt immer auf gleiche variable....damit wird immer gleicher from wert genutzt und _r _s angehängt....fixen
- strcat(username, "_r");
-
+ strcat(&username, "_r");
+
if (init_connection_receiver(receiver_server_ip, username) == 0)
{
printf("RECEIVER: connection succesfull...\n");