Changeset 3453 for trunk/jons-gtk2-gui

Timestamp:

04/20/03 09:45:33 (6 years ago)

Author:

bostjanlah

Message:

More utf8 fixes from Matias

Files:

• trunk/jons-gtk2-gui/src/security_window.cpp (modified) (6 diffs)

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

@@ -20 +20 @@
 
 #include "licq_gtk.h"
+#include "utilities.h"
 
 #include <gtk/gtk.h>
@@ -150 +151 @@
     us->check_auth = gtk_check_button_new_with_label("Authorization Required");
     gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), us->check_auth,
-        "Determines whether regular ICQ clients require your authorization to add you to their contact list.", 0);
+        "Determines whether regular ICQ clients require your authorization to add you to their contact list.", NULL);
     gtk_box_pack_start(GTK_BOX(v_box), us->check_auth, FALSE, FALSE, 0);
 
@@ -156 +157 @@
     us->check_web = gtk_check_button_new_with_label("Web Presence");
     gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), us->check_web,
-        "Web Presence allows users to see if you are online through your web indicator.", 0);   
+        "Web Presence allows users to see if you are online through your web indicator.", NULL);    
     gtk_box_pack_start(GTK_BOX(v_box), us->check_web, FALSE, FALSE, 0);
 
-    /* Third optoin */
+    /* Third option */
     us->check_hideip = gtk_check_button_new_with_label("Hide IP");
     gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), us->check_hideip,
-        "Hiding IP is a minor prevention for regular ICQ clients to not reveal your IP to users.", 0);
+        "Hiding IP is a minor prevention for regular ICQ clients to not reveal your IP to users.", NULL);
     gtk_box_pack_start(GTK_BOX(v_box), us->check_hideip, FALSE, FALSE, 0);
 
@@ -306 +307 @@
             gtk_list_store_set(store, &iter,
                     0, pUser->Uin(),
-                    1, pUser->GetAlias(),
+                    1, (s_convert_to_utf8(pUser->GetAlias(), pUser->UserEncoding())).c_str(),
                     2, pUser->GetEmailPrimary(),
                     3, (gpointer)pUser, -1);
@@ -324 +325 @@
             gtk_list_store_set(store, &iter,
                     0, pUser->Uin(),
-                    1, pUser->GetAlias(),
+                    1, (s_convert_to_utf8(pUser->GetAlias(), pUser->UserEncoding())).c_str(),
                     2, pUser->GetEmailPrimary(),
                     3, (gpointer)pUser, -1);
@@ -342 +343 @@
             gtk_list_store_set(store, &iter,
                     0, pUser->Uin(),
-                    1, pUser->GetAlias(),
+                    1, (s_convert_to_utf8(pUser->GetAlias(), pUser->UserEncoding())).c_str(),
                     2, pUser->GetEmailPrimary(),
                     3, (gpointer)pUser, -1);