tleenx-cvs

[<hso...@us...>]

Update of /cvsroot/tleenx/tleenx2/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29277/src

Modified Files:
	callbacks.c users.c users.h windows.c 
Log Message:
poprawienie sprawdzania obecnosci transportu gg na jabberze


Index: callbacks.c
===================================================================
RCS file: /cvsroot/tleenx/tleenx2/src/callbacks.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- callbacks.c	21 Mar 2006 00:00:09 -0000	1.81
+++ callbacks.c	14 Apr 2006 21:30:32 -0000	1.82
@@ -1500,7 +1500,7 @@
 on_button_authorize_ok_clicked         (GtkWidget       *window3)
 {
   GtkWidget *label;
-  gchar *jid;
+  gchar *jid, *sub;
   struct user *u;
   gint type;
 
@@ -1523,7 +1523,8 @@
         jabber_subscribe_accept(jid);
         break;
     }
-  if(!strcmp(user_subscription(jid),"from") && type != USER_AGENT)
+  sub = (gchar*) user_subscription(jid);
+  if(sub && !strcmp (sub, "from") && type != USER_AGENT)
     contact_add(jid, type);
   else
     list_reload_all();

Index: users.c
===================================================================
RCS file: /cvsroot/tleenx/tleenx2/src/users.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- users.c	21 Mar 2006 00:00:11 -0000	1.23
+++ users.c	14 Apr 2006 21:30:32 -0000	1.24
@@ -228,7 +228,7 @@
 }
 
 
-gchar *user_subscription(const gchar *jid)
+const gchar *user_subscription(const gchar *jid)
 {
   GList *list=users_list;
   struct user *user;
@@ -239,7 +239,7 @@
       return user->subscription;
     list=list->next;
   }
-  return NULL;
+  return "";
 }
 
 //usuwa z id slash wraz z resource

Index: users.h
===================================================================
RCS file: /cvsroot/tleenx/tleenx2/src/users.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- users.h	21 Mar 2006 00:00:11 -0000	1.12
+++ users.h	14 Apr 2006 21:30:32 -0000	1.13
@@ -45,7 +45,7 @@
 void del_user(gchar *jid);
 void add_virtualusers();
 struct user *get_user(const gchar *jid);
-gchar *user_subscription(const gchar *jid);
+const gchar *user_subscription(const gchar *jid);
 void users_list_clear();
 void talks_list_clear();
 gint users_list_count(GList *l);

Index: windows.c
===================================================================
RCS file: /cvsroot/tleenx/tleenx2/src/windows.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- windows.c	21 Mar 2006 00:00:11 -0000	1.40
+++ windows.c	14 Apr 2006 21:30:32 -0000	1.41
@@ -332,7 +332,12 @@
   if(!textbg)
     textbg = g_strdup("#DCDAD5");
   if(preferences & PREF_DEBUGON)
+  {
     tlen_setdebug(1);
+    jabby_debug_mode (1);
+  }
+  else
+    jabby_debug_mode (0);
   if(status != TLEN_STATUS_UNAVAILABLE)
     work_online();
   //    else
@@ -1262,9 +1267,13 @@
   {
     preferences |= PREF_DEBUGON;
     tlen_setdebug(1);
+    jabby_debug_mode (1);
   }
   else
+  {
     tlen_setdebug(0);
+    jabby_debug_mode (0);
+  }
   button = lookup_widget(window_prefs,"checkbutton_list_expanded");
   if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)))
     preferences |= PREF_LIST_EXPANDED;