Changeset 2159 for trunk/jons-gtk-gui

Timestamp:

07/18/00 16:07:02 (8 years ago)

Author:

emojon

Message:

Fixed updating owner's info, everything works with that now.

Location:

trunk/jons-gtk-gui/src

Files:

• extras.cpp (modified) (6 diffs)
• licq_gtk.h (modified) (5 diffs)
• status.cpp (modified) (2 diffs)
• system_message.cpp (modified) (1 diff)
• user_info_window.cpp (modified) (11 diffs)

trunk/jons-gtk-gui/src/extras.cpp

@@ -438 +438 @@
         return;
 
-    const gchar *name = g_strdup_printf("%s %s", iu->user->GetFirstName(),
-                        iu->user->GetLastName());
     const SCountry *country = GetCountryByCode(iu->user->GetCountryCode());
-    const SLanguage *l1 = GetLanguageByCode(iu->user->GetLanguage(0));
-    const SLanguage *l2 = GetLanguageByCode(iu->user->GetLanguage(1));
-    const SLanguage *l3 = GetLanguageByCode(iu->user->GetLanguage(2));
-
-    gchar *bday;
-    gchar *age;
+//  const SLanguage *l1 = GetLanguageByCode(iu->user->GetLanguage(0));
+//  const SLanguage *l2 = GetLanguageByCode(iu->user->GetLanguage(1));
+//  const SLanguage *l3 = GetLanguageByCode(iu->user->GetLanguage(2));
+
+    gchar bday[11];
+    gchar age[6];
 
     if(iu->user->GetAge() != 65535)
-        age = g_strdup_printf("%hd", iu->user->GetAge());
+        sprintf(age, "%hd", iu->user->GetAge());
     else
-        age = "N/A";
+        strcpy(age, "N/A");
 
     if(iu->user->GetBirthMonth() == 0 || iu->user->GetBirthDay() == 0)
-        bday = "N/A";
+        strcpy(bday, "N/A");
     else
-        bday = g_strdup_printf("%d/%d/%d", iu->user->GetBirthMonth(),
+        sprintf(bday, "%d/%d/%d", iu->user->GetBirthMonth(),
             iu->user->GetBirthDay(), iu->user->GetBirthYear());
 
@@ -465 +463 @@
     case USER_EXT:
         gtk_entry_set_text(GTK_ENTRY(iu->alias), iu->user->GetAlias());
-        gtk_entry_set_text(GTK_ENTRY(iu->name), name);
+        gtk_entry_set_text(GTK_ENTRY(iu->fname),
+                   iu->user->GetFirstName());
+        gtk_entry_set_text(GTK_ENTRY(iu->lname),
+                   iu->user->GetLastName());
         gtk_entry_set_text(GTK_ENTRY(iu->email1),
                    iu->user->GetEmailPrimary());
         gtk_entry_set_text(GTK_ENTRY(iu->email2),
                    iu->user->GetEmailSecondary());
+        gtk_entry_set_text(GTK_ENTRY(iu->oldemail),
+                   iu->user->GetEmailOld());
         gtk_entry_set_text(GTK_ENTRY(iu->address),
                    iu->user->GetAddress());
@@ -478 +481 @@
         if(country == NULL)
             gtk_entry_set_text(GTK_ENTRY(iu->country),
-                       "Unknown");
+                       "Unspecified");
         else
             gtk_entry_set_text(GTK_ENTRY(iu->country),
                        country->szName);
 
-
         gtk_entry_set_text(GTK_ENTRY(iu->phone),
                    iu->user->GetPhoneNumber());
+        gtk_entry_set_text(GTK_ENTRY(iu->cellphone),
+                   iu->user->GetCellularNumber());
+        gtk_entry_set_text(GTK_ENTRY(iu->faxnumber),
+                   iu->user->GetFaxNumber());
         break;
     case USER_MORE:
@@ -501 +507 @@
         gtk_entry_set_text(GTK_ENTRY(iu->homepage),
                    iu->user->GetHomepage());
-        if(l1 == NULL)
-            gtk_entry_set_text(GTK_ENTRY(iu->lang1), "Unknown");
+
+        for(unsigned short i = 0; i < 3; i++) {
+        const SLanguage *l = GetLanguageByCode(iu->user->GetLanguage(i));
+        if(l == NULL)
+            gtk_entry_set_text(GTK_ENTRY(iu->lang[i]), "Unknown");
         else
-            gtk_entry_set_text(GTK_ENTRY(iu->lang1), l1->szName);
-
+            gtk_entry_set_text(GTK_ENTRY(iu->lang[i]), l->szName);
+        }
+/*
         if(l2 == NULL)
                         gtk_entry_set_text(GTK_ENTRY(iu->lang2), "Unknown");
@@ -515 +525 @@
                 else
                         gtk_entry_set_text(GTK_ENTRY(iu->lang3), l3->szName);
-        break;
+    */  break;
     case USER_WORK:
         gtk_entry_set_text(GTK_ENTRY(iu->company),
@@ -529 +539 @@
         gtk_entry_set_text(GTK_ENTRY(iu->co_phone),
                    iu->user->GetCompanyPhoneNumber());
+        gtk_entry_set_text(GTK_ENTRY(iu->co_fax),
+                   iu->user->GetCompanyFaxNumber());
         gtk_entry_set_text(GTK_ENTRY(iu->co_city),
                    iu->user->GetCompanyCity());

trunk/jons-gtk-gui/src/licq_gtk.h

@@ -81 +81 @@
 {
     GtkWidget *window;
+    GtkWidget *notebook;
     GtkWidget *alias;
-    GtkWidget *name;
+    GtkWidget *fname;
+    GtkWidget *lname;
     GtkWidget *email1;
     GtkWidget *email2;
+    GtkWidget *oldemail;
     GtkWidget *address;
     GtkWidget *city;
@@ -90 +93 @@
     GtkWidget *zip;
     GtkWidget *country;
+    GtkWidget *o_country;
     GtkWidget *phone;
+    GtkWidget *cellphone;
+    GtkWidget *faxnumber;
+    GtkWidget *need_auth;
+    GtkWidget *hide_email;
     GtkWidget *age;
     GtkWidget *gender;
+    GtkWidget *o_gender;
     GtkWidget *homepage;
     GtkWidget *bday;
-    GtkWidget *lang1;
-    GtkWidget *lang2;
-    GtkWidget *lang3;
+    GtkWidget *o_bday;
+    GtkWidget *o_bmonth;
+    GtkWidget *o_byear;
+    GtkWidget *lang[3];
+    GtkWidget *o_lang[3];
     GtkWidget *company;
     GtkWidget *dept;
@@ -106 +117 @@
     GtkWidget *co_city;
     GtkWidget *co_state;
+    GtkWidget *co_fax;
     GtkWidget *about;
     GtkWidget *update;
@@ -578 +590 @@
 /* Functions in menu.cpp */
 extern GtkWidget *menu_new_item(GtkWidget *, const char *, GtkSignalFunc);
+extern GtkWidget *menu_new_item_with_pixmap(GtkWidget *, const char *,
+    GtkSignalFunc, struct status_icon *);
 extern void menu_separator(GtkWidget *);
 extern void menu_create();
@@ -683 +697 @@
 extern struct info_user *iu_new(ICQUser *);
 extern struct info_user *iu_find(unsigned long);
-extern void do_entry(GtkWidget *&, GtkWidget *&, const gchar *,
-             const gchar *, gboolean);
-extern void pack_hbox(GtkWidget *&, GtkWidget *, GtkWidget *);
+extern void do_entry(GtkWidget *&, const gchar *, gboolean);
+extern void do_label_and_entry(GtkWidget *&, const gchar *,
+    const gchar *, GtkWidget *&, gint, gint, gboolean);
 
 

trunk/jons-gtk-gui/src/status.cpp

@@ -74 +74 @@
 
     _menu_item =
-        menu_new_item(_menu, "Free For Chat",
-                GTK_SIGNAL_FUNC(status_ffc));
-    _menu_item =
-        menu_new_item(_menu, "Online", GTK_SIGNAL_FUNC(status_online));
-
-    _menu_item =
-        menu_new_item(_menu, "Away", GTK_SIGNAL_FUNC(status_away));
-
-    _menu_item =
-        menu_new_item(_menu, "Not Available",
-                GTK_SIGNAL_FUNC(status_na));
-
-    _menu_item =
-        menu_new_item(_menu, "Occupied", GTK_SIGNAL_FUNC(status_occ));
-
-    _menu_item =
-        menu_new_item(_menu, "Do Not Disturb",
-                GTK_SIGNAL_FUNC(status_dnd));
-
-    _menu_item =
-        menu_new_item(_menu, "Offline", GTK_SIGNAL_FUNC(status_off));
-
-    /* The invisible selection */
-    _menu_item = gtk_check_menu_item_new_with_label("Invisible");
+        menu_new_item_with_pixmap(_menu, "Free For Chat",
+            GTK_SIGNAL_FUNC(status_ffc), ffc);
+    _menu_item =
+        menu_new_item_with_pixmap(_menu, "Online",
+            GTK_SIGNAL_FUNC(status_online), online);
+
+    _menu_item =
+        menu_new_item_with_pixmap(_menu, "Away",
+            GTK_SIGNAL_FUNC(status_away), away);
+
+    _menu_item =
+        menu_new_item_with_pixmap(_menu, "Not Available",
+            GTK_SIGNAL_FUNC(status_na), na);
+
+    _menu_item =
+        menu_new_item_with_pixmap(_menu, "Occupied",
+            GTK_SIGNAL_FUNC(status_occ), occ);
+
+    _menu_item =
+        menu_new_item_with_pixmap(_menu, "Do Not Disturb",
+            GTK_SIGNAL_FUNC(status_dnd), dnd);
+
+    _menu_item =
+        menu_new_item_with_pixmap(_menu, "Offline",
+            GTK_SIGNAL_FUNC(status_off), offline);
+
+    // Separator
+    GtkWidget *separator = gtk_hseparator_new();
+    _menu_item = gtk_menu_item_new();
     gtk_menu_append(GTK_MENU(_menu), _menu_item);
-    gtk_signal_connect(GTK_OBJECT(_menu_item), "toggled",
-               GTK_SIGNAL_FUNC(status_invisible), _menu_item);
-    gtk_widget_show(_menu_item);
-
-    /* Set the state for the invisible checkmark */
-    ICQOwner *owner = gUserManager.FetchOwner(LOCK_R);
-    gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(_menu_item),
-            owner->StatusInvisible());
-    gUserManager.DropOwner();
-
+    gtk_container_add(GTK_CONTAINER(_menu_item), separator);
+    gtk_widget_set_sensitive(_menu_item, false);
+    gtk_widget_show_all(_menu_item);
+
+    _menu_item = 
+        menu_new_item_with_pixmap(_menu, "Invisible",
+            GTK_SIGNAL_FUNC(status_invisible), invisible);
     _root_menu =
         menu_new_item(NULL, "", NULL);
@@ -172 +174 @@
     ICQOwner *owner = gUserManager.FetchOwner(LOCK_R);
     
-    if(GTK_CHECK_MENU_ITEM(invisible_check)->active)
+    if(!(owner->StatusFull() & ICQ_STATUS_FxPRIVATE))
     {
         icq_daemon->icqSetStatus(owner->StatusFull() | ICQ_STATUS_FxPRIVATE);

trunk/jons-gtk-gui/src/system_message.cpp

@@ -90 +90 @@
         break;
 
-    case ICQ_CMDxSUB_CONTACTxLIST:
-        gtk_text_insert(GTK_TEXT(sm->text), 0, 0, 0,
-                "Contact\n-------\n\n", -1);
-        break;
-
     default:
         g_print("Unknown system message type\n");

trunk/jons-gtk-gui/src/user_info_window.cpp

@@ -27 +27 @@
 
 #include <gtk/gtk.h>
+#include <stdlib.h>
 
 GSList *iu_list;
@@ -34 +35 @@
     gboolean is_o = FALSE;
 
-    /* Check to see if it's for the owner */
+    // Check to see if it's for the owner 
     if(user == NULL)
     {
@@ -54 +55 @@
     GtkWidget *label;
     GtkWidget *entry;
-    GtkWidget *h_box;
     GtkWidget *v_box;
     GtkWidget *v_scroll;
-    GtkWidget *general_box;
-    GtkWidget *address_box;
-    GtkWidget *more_box;
-    GtkWidget *work_box;
-    GtkWidget *about_box;
     GtkWidget *save;
     GtkWidget *close;
-    GtkWidget *notebook;
     GtkWidget *statusbar;
     const gchar *title = g_strdup_printf("Info for %s", user->GetAlias());
-    const gchar *name = g_strdup_printf("%s %s", user->GetFirstName(),
-                        user->GetLastName());
     const gchar *uin = g_strdup_printf("%ld", user->Uin());
-    gchar *online;
+    gchar real_ip[32];
+    const gulong _realip = user->RealIp();
     gchar buf[32];
+    strcpy(real_ip, inet_ntoa_r(*(struct in_addr *)&_realip, buf));
     
     /* Take care of the e_tag_data stuff */
@@ -85 +79 @@
     /* Make the scroll window for the about box */
     v_scroll = gtk_scrolled_window_new(NULL, NULL);
-    gtk_widget_set_usize(v_scroll, 250, 135);
+    gtk_widget_set_usize(v_scroll, 175, 115);
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(v_scroll),
                        GTK_POLICY_NEVER,
@@ -91 +85 @@
 
     /* Create new boxes */
-    h_box = gtk_hbox_new(FALSE, 5);
     v_box = gtk_vbox_new(FALSE, 5);
-    general_box = gtk_vbox_new(FALSE, 5);
-    address_box = gtk_vbox_new(FALSE, 5);
-    more_box = gtk_vbox_new(FALSE, 5);
-    work_box = gtk_vbox_new(FALSE, 5);
-    about_box = gtk_vbox_new(FALSE, 5);
 
     /* The notebook */
-    notebook = gtk_notebook_new();
-
-    /* START THE GENERAL TAB */
-
-    /* The Alias entry and label */
-    do_entry(iu->alias, label, "Nick:      ", user->GetAlias(), is_o);
-    gtk_entry_set_editable(GTK_ENTRY(iu->alias), TRUE);
-
-    /* Pack the alias */
-    gtk_box_pack_start(GTK_BOX(h_box), label, FALSE, FALSE, 5);
-    gtk_box_pack_start(GTK_BOX(h_box), iu->alias, FALSE, FALSE, 0);
-
-    /* The Name box and label */
-    do_entry(iu->name, label, "Name:     ", name, is_o);
-
-    /* Pack the name */
-    gtk_box_pack_start(GTK_BOX(h_box), label, FALSE, FALSE, 5);
-    gtk_box_pack_start(GTK_BOX(h_box), iu->name, FALSE, FALSE, 0);
-
-    /* Pack the Alias and Name E&L's in a horizontal line */
-    gtk_box_pack_start(GTK_BOX(general_box), h_box, FALSE, FALSE, 5);
-
-    h_box = gtk_hbox_new(FALSE, 5);
-
-    /* The UIN box and label */
-    do_entry(entry, label, "UIN:       ", uin, FALSE);
-
-    /* Pack the UIN */
-    gtk_box_pack_start(GTK_BOX(h_box), label, FALSE, FALSE, 5);
-    gtk_box_pack_start(GTK_BOX(h_box), entry , FALSE, FALSE, 0); 
-
-    /* The IP box and label */
-    do_entry(entry, label, "IP:          ", user->IpPortStr(buf),
-         FALSE);
-
-    /* Pack the IP */
-    gtk_box_pack_start(GTK_BOX(h_box), label, FALSE, FALSE, 5);
-    gtk_box_pack_start(GTK_BOX(h_box), entry, FALSE, FALSE, 0);
-
-    /* Pack the UIN and IP in a horizontal line */
-    gtk_box_pack_start(GTK_BOX(general_box), h_box, FALSE, FALSE, 5);
-
-    h_box = gtk_hbox_new(FALSE, 5);
-
-    /* The primary e-mails */
-    do_entry(iu->email1, label, "E-mail 1:", user->GetEmailPrimary(), is_o);
-
-    /* Pack the email1 */
-    gtk_box_pack_start(GTK_BOX(h_box), label, FALSE, FALSE, 5);
-    gtk_box_pack_start(GTK_BOX(h_box), iu->email1, FALSE, FALSE, 0);
-
-    /* The secondary e-mail */
-    do_entry(iu->email2, label, "E-mail 2:", user->GetEmailSecondary(), is_o);
-
-    /* Pack the email2 */
-    gtk_box_pack_start(GTK_BOX(h_box), label, FALSE, FALSE, 5);
-    gtk_box_pack_start(GTK_BOX(h_box), iu->email2, FALSE, FALSE, 0);
-
-    /* Pack e-mail1 and e-mail2 in a horizontal line */
-    gtk_box_pack_start(GTK_BOX(general_box), h_box, FALSE, FALSE, 5); 
-
-    h_box = gtk_hbox_new(FALSE, 0);
-
+    iu->notebook = gtk_notebook_new();
+
+//------ START THE GENERAL TAB ---------------------------
+
+    GtkWidget *general_table = gtk_table_new(6, 4, false);
+
+    // Alias (always editable)
+    do_label_and_entry(iu->alias, user->GetAlias(), "Alias:",
+        general_table, 0, 0, true);
+
+    // UIN (never editable)
+    do_label_and_entry(entry, uin, "UIN:", general_table, 
+        2, 0, false);
+
+    // Full Name
+    do_label_and_entry(iu->fname, user->GetFirstName(), "First Name:",
+        general_table, 0, 1, is_o);
+    
+    // Last Name
+    do_label_and_entry(iu->lname, user->GetLastName(), "Last Name:",
+        general_table, 2, 1, is_o);
+    
+    // IP (never editable)
+    do_label_and_entry(entry, user->IpPortStr(buf), "IP:", 
+        general_table, 0, 2, false);
+
+    // Real IP (never editable)
+    do_label_and_entry(entry, real_ip, "Real IP:", general_table,
+        2, 2, false);
+    
+    // Primary e-mail
+    do_label_and_entry(iu->email1, user->GetEmailPrimary(),
+        "Primary E-Mail:", general_table, 0, 3, is_o);
+
+    // Secondary e-mail
+    do_label_and_entry(iu->email2, user->GetEmailSecondary(),
+        "Secondary E-mail:", general_table, 2, 3, is_o);
+
+    // Old e-mail
+    do_label_and_entry(iu->oldemail, user->GetEmailOld(),
+        "Old E-mail:", general_table, 0, 4, is_o);
+
+    // Hide e-mail is needed anyways.. use an if statement to decide
+    // where it goes..
+    iu->hide_email = gtk_check_button_new_with_label(
+        "Hide E-mail Address");
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(iu->hide_email),
+        user->GetHideEmail());
+        
+    // If it's not the owner, show last seen
     if(!is_o)
     {
+        gchar online[28];
+        
         if(!iu->user->StatusOffline())
-            online = "Now";
+            strcpy(online, "Now");
         else if(iu->user->LastOnline() == 0)
-            online = "Unknown";
+            strcpy(online, "Unknown");
         else
         {
             time_t last = iu->user->LastOnline();
-            online = ctime(&last);
+            strcpy(online, ctime(&last));
         }
     
-        do_entry(entry, label, "Last Seen:", online, FALSE);
-        pack_hbox(h_box, label, entry);
+        do_label_and_entry(entry, online, "Last Seen:", general_table,
+            2, 4, FALSE);
+
+        iu->need_auth = gtk_check_button_new_with_label(
+            "Need Authorization To Add");
+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
+            iu->need_auth), iu->user->GetAuthorization());
+        gtk_widget_set_sensitive(iu->need_auth, false);
+        gtk_table_attach(GTK_TABLE(general_table), iu->need_auth, 0, 2,
+            5, 6, GTK_FILL, GTK_FILL, 3, 1);
+
+        gtk_widget_set_sensitive(iu->hide_email, false);
+        gtk_table_attach(GTK_TABLE(general_table), iu->hide_email, 2, 4,
+            5, 6,
+            GtkAttachOptions(0),
+            GtkAttachOptions(0), 3, 1);
+    }
+    // It's the owner
+    else
+    {
+        gtk_table_attach(GTK_TABLE(general_table), iu->hide_email,
+            0, 2, 5, 6, GTK_FILL, GTK_FILL, 3, 1);
+    }
+
+//------- END GENERAL TAB ----------------------------------
+
+//------- START ADDRESS TAB --------------------------------
+
+    // Address info table
+    GtkWidget *address_table = gtk_table_new(4, 2, false);
+
+    // Address
+    do_label_and_entry(iu->address, user->GetAddress(), "Address:",
+        address_table, 0, 0, is_o);
+
+    // City
+    do_label_and_entry(iu->city, user->GetCity(), "City:", 
+        address_table, 2, 0, is_o);
+
+    // State
+    do_label_and_entry(iu->state, user->GetState(), "State:",
+        address_table, 0, 1, is_o);
+
+    // Zip
+    do_label_and_entry(iu->zip, user->GetZipCode(), "Zip:",
+        address_table, 2, 1, is_o);
+
+    // Country
+    SCountry *sc = (SCountry *)GetCountryByCode(user->GetCountryCode());
+    gchar country[32];
+
+    if(sc == NULL)
+        strcpy(country, "Unspecified");
+
+    else
+        strcpy(country, sc->szName);
+
+    if(!is_o)
+    {
+        do_label_and_entry(iu->country, country, "Country:",
+            address_table, 0, 2, FALSE);
+    }
+    else
+    {
+        iu->o_country = gtk_combo_new();
+        GList *country_strings = NULL;
+
+        country_strings = g_list_append(country_strings,
+            "Unspecified");
+        for(unsigned short j = 0; j < NUM_COUNTRIES; j++)
+            country_strings = g_list_append(country_strings,
+                GetCountryByIndex(j)->szName);
+
+        gtk_combo_set_popdown_strings(GTK_COMBO(iu->o_country),
+            country_strings);
+        gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(iu->o_country)->entry),
+            false);
+        gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(iu->o_country)->entry),
+            country);
+
+        label = gtk_label_new("Country:");
+        gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+        
+        gtk_table_attach(GTK_TABLE(address_table), label, 0, 1, 2, 3,
+            GtkAttachOptions(GTK_EXPAND | GTK_FILL),
+            GTK_FILL, 3, 1);
+        gtk_table_attach(GTK_TABLE(address_table), iu->o_country,
+            1, 2, 2, 3,
+            GtkAttachOptions(GTK_EXPAND | GTK_FILL),
+            GTK_FILL, 3, 1);
+    }
+        
+    // Phone number
+    do_label_and_entry(iu->phone, user->GetPhoneNumber(), "Phone Number:",
+        address_table, 2, 2, is_o);
+
+    // Cellular number
+    do_label_and_entry(iu->cellphone, user->GetCellularNumber(),
+        "Cellular Number:", address_table, 0, 3, is_o);
+
+    // Fax number
+    do_label_and_entry(iu->faxnumber, user->GetFaxNumber(), "Fax Number:",
+        address_table, 2, 3, is_o);
+
+//------- END ADDRESS TAB ---------------------------------------- 
+
+//------- START MORE TAB -----------------------------------------
+
+    GtkWidget *more_table = gtk_table_new(3, 2, false);
+
+    // Age
+    gchar age[6];
+    if(user->GetAge() != 65535)
+        sprintf(age, "%hd", user->GetAge());
+    else
+        strcpy(age, "N/A");
     
+    do_label_and_entry(iu->age, age, "Age:", more_table,
+        0, 0, is_o);
+
+    // Gender
+    if(!is_o)
+    {
+        gchar gender[12];
+        if(user->GetGender() == 1)
+            strcpy(gender, "Female");
+        else if(user->GetGender() == 2)
+            strcpy(gender, "Male");
+        else
+            strcpy(gender, "Unspecified");
+
+        do_label_and_entry(iu->gender, gender, "Gender:", more_table,
+            2, 0, FALSE);
+    }
+    else
+    {
+        iu->o_gender = gtk_combo_new();
+        GList *gender_strings = NULL;
+        gender_strings = g_list_append(gender_strings, "(None)");
+        gender_strings = g_list_append(gender_strings, "Female");
+        gender_strings = g_list_append(gender_strings, "Male");
+        gtk_combo_set_popdown_strings(GTK_COMBO(iu->o_gender),
+            gender_strings);
+        gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(iu->o_gender)->entry),
+            false);
+
+        label = gtk_label_new("Gender:");
+        gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+        
+        gtk_table_attach(GTK_TABLE(more_table), label, 2, 3, 0, 1,
+            GtkAttachOptions(GTK_EXPAND | GTK_FILL),
+            GTK_FILL, 3, 1);
+        gtk_table_attach(GTK_TABLE(more_table), iu->o_gender,
+            3, 4, 0, 1,
+            GtkAttachOptions(GTK_EXPAND | GTK_FILL),
+            GTK_FILL, 3, 1);
+    }
+
+    // Homepage
+    do_label_and_entry(iu->homepage, user->GetHomepage(), "Homepage:",
+         more_table, 0, 1, is_o);
+
+    // Birthday
+    if(!is_o)
+    {
+        gchar bday[11];
+
+        if(user->GetBirthMonth() == 0 || user->GetBirthDay() == 0)
+            strcpy(bday, "N/A");
+
+        else
+            sprintf(bday, "%d/%d/%d", user->GetBirthMonth(),
+                user->GetBirthDay(), user->GetBirthYear());
+
+        do_label_and_entry(iu->bday, bday, "Birthday:", more_table,
+            2, 1, FALSE);
+    }
+    else
+    {
+        label = gtk_label_new("Birthday:");
+        gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+        gtk_table_attach(GTK_TABLE(more_table), label, 2, 3, 1, 2,
+            GtkAttachOptions(GTK_EXPAND | GTK_FILL),
+            GTK_FILL, 3, 1);
+
+        GtkWidget *h_box = gtk_hbox_new(false, 0);
+
+        label = gtk_label_new("Month:");
+        GtkAdjustment *month_adj =
+            (GtkAdjustment *)gtk_adjustment_new(
+                user->GetBirthMonth(), 1.0, 12.0,
+                1.0, 3.0, 3.0);
+        iu->o_bmonth = gtk_spin_button_new(month_adj, 1.0, 0);
+        gtk_spin_button_set_update_policy(GTK_SPIN_BUTTON(iu->o_bmonth),
+            GTK_UPDATE_IF_VALID);
+        gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(iu->o_bmonth),
+            true);
+        
+        gtk_box_pack_start(GTK_BOX(h_box), label, false, false, 3);
+        gtk_box_pack_start(GTK_BOX(h_box), iu->o_bmonth, false, false,
+            3);
+
+        label = gtk_label_new("Day:");
+        GtkAdjustment *day_adj =
+            (GtkAdjustment *)gtk_adjustment_new(
+                user->GetBirthDay(), 1.0, 31.0, 1.0, 5.0, 5.0);
+        iu->o_bday = gtk_spin_button_new(day_adj, 1.0, 0);
+        gtk_spin_button_set_update_policy(GTK_SPIN_BUTTON(iu->o_bday),
+            GTK_UPDATE_IF_VALID);