Changeset 3309 for trunk/jons-gtk2-gui

Timestamp:

02/26/03 10:18:19 (6 years ago)

Author:

bostjanlah

Message:

Complete revision

Files:

• trunk/jons-gtk2-gui/src/search_user_window.cpp (modified) (18 diffs)

trunk/jons-gtk2-gui/src/search_user_window.cpp

@@ -20 +20 @@
 
 #include "licq_gtk.h"
+#include "utilities.h"
 
 #include "licq_icqd.h"
@@ -55 +56 @@
     GtkWidget *list;
     GtkWidget *clear;
-    struct e_tag_data *etag;
+    GtkWidget *statusbar;
+    unsigned long e_tag;
 };
 
-struct search_user *su;
-static gint num_found_users;
+struct search_user *su = NULL;
+static gint num_found_users = 0;
 
 GtkWidget *
@@ -71 +73 @@
 const char *genders[] = {"Unspecified", "Female", "Male"};
 static const int NUM_GENDERS = 3;
+const char *ages[] = {"Unspecified", "18 - 22", "23 - 29", "30 - 39", "40 - 49",
+        "50 - 59", "60+"};
+static const int NUM_AGES = 7;
 
 GtkWidget *
@@ -88 +93 @@
 {
     /* Only one search window */
-    if (su != 0) {
+    if (su != NULL) {
         gdk_window_raise(su->window->window);
         return;
@@ -94 +99 @@
 
     su = g_new0(struct search_user, 1);
-    su->etag = g_new0(struct e_tag_data, 1);
 
     num_found_users = 0;
@@ -101 +105 @@
     su->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
     gtk_window_set_title(GTK_WINDOW(su->window), "Licq - User Search");
-
-    // gtk_window_set_default_size(GTK_WINDOW(su->window), 550, 350);
 
     /* destroy event for window */
@@ -133 +135 @@
     GtkWidget *age_menu = gtk_menu_new();
     gtk_option_menu_set_menu(GTK_OPTION_MENU(su->age), age_menu);
-    gtk_menu_shell_append(GTK_MENU_SHELL(age_menu), 
-            gtk_menu_item_new_with_label("Unspecified"));
-    gtk_menu_shell_append(GTK_MENU_SHELL(age_menu), 
-            gtk_menu_item_new_with_label("18 - 22"));
-    gtk_menu_shell_append(GTK_MENU_SHELL(age_menu), 
-            gtk_menu_item_new_with_label("23 - 29"));
-    gtk_menu_shell_append(GTK_MENU_SHELL(age_menu), 
-            gtk_menu_item_new_with_label("30 - 39"));
-    gtk_menu_shell_append(GTK_MENU_SHELL(age_menu), 
-            gtk_menu_item_new_with_label("40 - 49"));
-    gtk_menu_shell_append(GTK_MENU_SHELL(age_menu), 
-            gtk_menu_item_new_with_label("50 - 59"));
-    gtk_menu_shell_append(GTK_MENU_SHELL(age_menu), 
-            gtk_menu_item_new_with_label("60+"));
+    for (int i = 0; i < NUM_AGES; ++i)
+        gtk_menu_shell_append(GTK_MENU_SHELL(age_menu), 
+                gtk_menu_item_new_with_label(ages[i]));
     gtk_option_menu_set_history(GTK_OPTION_MENU(su->age), 0);
     gtk_table_attach(GTK_TABLE(whitepages), su->age,
@@ -302 +293 @@
 
     /* The statusbar */
-    GtkWidget *statusbar = gtk_statusbar_new();
-  gtk_box_pack_start(GTK_BOX(main_vbox), statusbar, TRUE, TRUE, 5);
-    
-    guint id = gtk_statusbar_get_context_id(GTK_STATUSBAR(statusbar),
+    su->statusbar = gtk_statusbar_new();
+  gtk_box_pack_start(GTK_BOX(main_vbox), su->statusbar, TRUE, TRUE, 5);
+    
+    guint id = gtk_statusbar_get_context_id(GTK_STATUSBAR(su->statusbar),
             "sta");
-    gtk_statusbar_pop(GTK_STATUSBAR(statusbar), id);
-    gtk_statusbar_push(GTK_STATUSBAR(statusbar), id,
+    gtk_statusbar_pop(GTK_STATUSBAR(su->statusbar), id);
+    gtk_statusbar_push(GTK_STATUSBAR(su->statusbar), id,
             "Enter Search Parameters");
-
-    /* The etag has to know about the statusbar */
-    su->etag->statusbar = statusbar;
 
     //gtk_widget_set_size_request(GTK_WIDGET(su->window), 435, 465); 
@@ -335 +323 @@
     gtk_list_store_clear(store);
     gtk_widget_set_sensitive(su->clear, FALSE);
+    change_status(su->statusbar, "sta", "");
 }
 
@@ -349 +338 @@
 }
 
-void search_callback(GtkWidget *widget, gpointer data)
-{
-    change_status(su->etag->statusbar, "sta", 
-            "Searching, this may take awhile.");
+void 
+search_callback(GtkWidget *widget, gpointer data)
+{
+    change_status(su->statusbar, "sta", "Searching, this may take awhile.");
     
     unsigned short mins[7] = {0, 18, 23, 30, 40, 50, 60};
   unsigned short maxs[7] = {0, 22, 29, 39, 49, 59, 120};
 
-    gulong uin = (gulong)(atol(get_text(su->uin)));
+    gulong uin = strtoul(get_text(su->uin), 0, 10);
 
     if(uin >= 10000)
-        su->etag->e_tag = icq_daemon->icqSearchByUin(uin);
+        su->e_tag = icq_daemon->icqSearchByUin(uin);
     else
-    su->etag->e_tag = icq_daemon->icqSearchWhitePages(
+    su->e_tag = icq_daemon->icqSearchWhitePages(
                 get_text(su->first_name),
                 get_text(su->last_name),
@@ -381 +370 @@
 }
 
-void search_list_double_click(GtkWidget *widget,
-                  GdkEventButton *eb,
-                  gpointer data)
-{
-    gulong uin;
-    ICQUser *user;
+void 
+search_list_double_click(GtkWidget *widget, GdkEventButton *eb, gpointer data)
+{
+    // we'll consider left button double click only
+  if (eb->type != GDK_2BUTTON_PRESS || eb->button != 1)
+        return;
 
     /* Get which cell was clicked in */
     GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(su->list));
+
     GtkTreeIter iter;
     GtkTreeModel *model;
-    
     if (!gtk_tree_selection_get_selected(sel, &model, &iter))
         return;
-    if(!(eb->type == GDK_2BUTTON_PRESS && eb->button == 1))
-        return;
 
     gchar *c_uin;
     gtk_tree_model_get(model, &iter, 1, &c_uin, -1);
-    uin = atol(c_uin);
+    gulong uin = strtoul(c_uin, 0, 10);
     g_free(c_uin);
 
-    if((uin == 0) || (user = gUserManager.FetchUser(uin, LOCK_N)))
+    // either invalid uin or we have this user already
+  if (uin == 0 || gUserManager.FetchUser(uin, LOCK_N) != NULL)
         return;
 
@@ -409 +397 @@
 
     char *for_statusbar = g_strdup_printf("User (%ld) added", uin);
-    change_status(su->etag->statusbar, "sta", for_statusbar);
+    change_status(su->statusbar, "sta", for_statusbar);
     g_free(for_statusbar);
 }
@@ -416 +404 @@
 {   
     /* Make sure it's the right event */
-    if(!event->Equals(su->etag->e_tag))
+    if (su == NULL || !event->Equals(su->e_tag))
         return;
 
@@ -429 +417 @@
 }
 
-void search_done(bool more)
+void 
+search_done(bool more)
 {
     if (more)
-        change_status(su->etag->statusbar, "sta",
+        change_status(su->statusbar, "sta",
             "More users found, narrow your search and try again.");
     else
-        change_status(su->etag->statusbar, "sta",
+        change_status(su->statusbar, "sta",
             "Search complete, double click user to add her/him.");
 }
 
-std::string
-s_convert_to_utf8(const gchar *input_text, const gchar *input_enc)
-{
-    if (input_text == 0 || input_text[0] == '\0')
-        return string("");
-    char *p = convert_to_utf8(input_text, input_enc);
-    string ret("");
-    if (p != 0) {
-        ret = p;
-        g_free(p);
-    }
-    return ret;
-}
-
-void search_found(CSearchAck *s)
-{
-    cerr << "s_f 1\n";
-    string name(
-            s_convert_to_utf8(s->FirstName(), 0) + ' ' + 
-            s_convert_to_utf8(s->LastName(), 0));
+void 
+search_found(CSearchAck *s)
+{
+    string name(s_convert_to_utf8(s->FirstName()) + ' ' + 
+        s_convert_to_utf8(s->LastName()));
 
     char *uin = g_strdup_printf("%ld", s->Uin());
-    string alias(s_convert_to_utf8(s->Alias(), 0));
-    string email(s_convert_to_utf8(s->Email(), 0));
-
-    cerr << "s_f 2\n";
-    
+    string alias(s_convert_to_utf8(s->Alias()));
+    string email(s_convert_to_utf8(s->Email()));
+
     GtkListStore *store = 
             GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(su->list)));
@@ -492 +464 @@
     else if (s->Gender() == 2)
         gender = "M";
-    char *sex_age = 0;
+    char *sex_age;
     if (s->Age())
         sex_age = g_strdup_printf("%s/%d", gender, s->Age());
@@ -498 +470 @@
         sex_age = g_strdup_printf("%s/?", gender);
     gtk_list_store_set(store, &iter, 5, sex_age, -1);
+    g_free(sex_age);
 
     if (s->Auth())
@@ -504 +477 @@
         gtk_list_store_set(store, &iter, 6, "Yes", -1);
     
-    cerr << "s_f 3\n";
-    
     num_found_users++;
     gtk_widget_set_sensitive(su->clear, TRUE);
@@ -512 +483 @@
 void search_failed()
 {
-    change_status(su->etag->statusbar, "sta", "Search failed.");
-}
-
-void search_close(GtkWidget *widget, gpointer data)
+    change_status(su->statusbar, "sta", "Search failed.");
+}
+
+void 
+search_close(GtkWidget *widget, gpointer data)
 {
     gtk_widget_destroy(su->window);
-    su = 0;
-}
+    g_free(su);
+    su = NULL;
+}