Changeset 3359 for trunk/jons-gtk2-gui

Timestamp:

03/13/03 08:57:55 (6 years ago)

Author:

bostjanlah

Message:

Remove the silly helper function

Files:

• trunk/jons-gtk2-gui/src/user_info_window.cpp (modified) (3 diffs)

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

@@ -96 +96 @@
 
 void
-list_info_user_uin(GtkWidget *window, unsigned long uin);
-
-void
 list_info_user(GtkWidget *window, ICQUser *user)
 {
-  if (user != NULL)
-    list_info_user_uin(window, user->Uin());
-  else  
-    list_info_user_uin(window, 0);
-}
-
-void
-list_info_user_uin(GtkWidget *window, unsigned long uin)
-{
-    struct info_user *iu = iu_find(uin);
+    gboolean is_o;
+    if (user == 0)  {
+        user = gUserManager.FetchOwner(LOCK_R);
+        is_o = TRUE;
+    }
+  else
+        is_o = FALSE;
+
+    struct info_user *iu = iu_find(user->Uin());
 
     if (iu != NULL) {
@@ -117 +113 @@
     }
 
-    gboolean is_o;
-
-    ICQUser *user;
-  // Check to see if it's for the owner 
-    if (uin == 0)   {
-        user = gUserManager.FetchOwner(LOCK_R);
-        is_o = TRUE;
-    }
-  else {
-      user = gUserManager.FetchUser(uin, LOCK_R);
-        is_o = FALSE;
-  }
-
-  if (user == NULL)
-    return;
-
-    iu = iu_new(uin);
+    iu = iu_new(user->Uin());
     /* Take care of the e_tag_data stuff */
     iu->etag = g_new0(struct e_tag_data, 1);
 
   iu->uin = user->Uin();
-
 
     GtkWidget *label;
@@ -684 +663 @@
 
     gtk_widget_show_all(iu->window);
-  gUserManager.DropUser(user);
+  if (is_o)
+    gUserManager.DropUser(user);
 }