Changeset 659

Timestamp:

12/13/05 23:10:54 (3 years ago)

Author:

smoku

Message:

big statuses update
- removed invisible status description
- femoved status_offline description
- descriptions are copied from jabber status
- or can be fixed permanently
- invisible and offline status with description implemented

Files:

• trunk/src/gg_versions.c (modified) (1 diff)
• trunk/src/message.c (modified) (7 diffs)
• trunk/src/presence.c (modified) (2 diffs)
• trunk/src/sessions.c (modified) (10 diffs)
• trunk/src/status.c (modified) (2 diffs)
• trunk/src/users.c (modified) (5 diffs)
• trunk/src/users.h (modified) (1 diff)

trunk/src/gg_versions.c

@@ -46 +46 @@
-        "6.0 (build 133)",                      /* 0x21 */
-        "6.0 (build 136,142)",                  /* 0x22 */
-        
+       
-        "6.0 (build 155)",                      /* 0x24 */
-        "7.0 (build 1)",                        /* 0x25 */

trunk/src/message.c

@@ -59 +59 @@
-void message_status(struct stream_s *s,const char *from, const char *to,
-                                const char *args, xmlnode msg);
-void message_offline_status(struct stream_s *s,const char *from, const char *to,
-                                const char *args, xmlnode msg);
-
-MsgCommand msg_commands[]={
-        {"get roster","gr",N_("Download user list from server"),message_get_roster,0},
-        {"friends only","fo",N_("\"Only for friends\" mode"),message_friends_only,0},
-
-
-
+
-        {"locale","loc",N_("Set user locale (language)"),message_locale,0},
-        {"ignore_unknown","iu",N_("Ignore messages from unknown users"),message_ignore_unknown,0},
@@ -73 +69 @@
-        {"unignore","ui",N_("Remove a user from, or view the ignore list"),message_unignore,0},
-        {"status","st",N_("Status message to show to GG users. Use 'off' to use Jabber status."),message_status,0},
-        {"offline_status","os",N_("Status message to show to GG users when not available. Use 'off' to use the one set with the command described above."),message_offline_status,0},
-        {NULL,NULL,NULL,0},
-};
@@ -336 +331 @@
-Session *session;
-User *user;
-char *m
+Resource *r
-gboolean on;
-
@@ -344 +339 @@
-        else
-                user=user_get_by_jid(from);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        else on=!user->invisible;
-
+        if (user->invisible==on){
+                message_send(stream,to,from,1,_("No change."),0);
+                return;
+        }
-        user->invisible=on;
-
-
-
-
-
-
-
-
+
+
+
+
-
-        if (session!=NULL) session_send_status(session);
+        r=session_get_cur_resource(session);
+        if ( r )
+                presence_send(stream,NULL,user->jid,user->invisible?-1:r->available,r->show,session->gg_status_descr,0);
-
-        user_save(user);
@@ -394 +377 @@
-        if (args) {
-                if (!g_strcasecmp(args,"off")) user->status=NULL;
-args
+from_utf8(args)
-        }
-        else user->status=NULL;
@@ -400 +383 @@
-        m=g_strdup_printf(_("status: %s%s%s"),
-                        (user->status?"`":""),
-user->status
+to_utf8(user->status)
-                        (user->status?"'":""));
-        message_send(stream,to,from,1,m,0);
-        g_free(m);
-
-        if (session!=NULL) session_send_status(session);
-        user_save(user);
-}
-
-void message_offline_status(struct stream_s *stream,const char *from, const char *to,
-                                const char *args, xmlnode msg){
-Session *session;
-User *user;
-char *m;
-
-        session=session_get_by_jid(from,stream,0);
-        if (session!=NULL)
-                user=session->user;
-        else
-                user=user_get_by_jid(from);
-
-        g_free(user->offline_status);
-        if (args) {
-                if (!g_strcasecmp(args,"off")) user->offline_status=NULL;
-                else user->offline_status=g_strndup(args,GG_STATUS_DESCR_MAXSIZE);
-        }
-        else user->offline_status=NULL;
-
-        m=g_strdup_printf(_("offline status: %s%s%s"),
-                        (user->offline_status?"`":""),
-                        (user->offline_status?user->offline_status:_("not set")),
-                        (user->offline_status?"'":""));
-        message_send(stream,to,from,1,m,0);
-        g_free(m);
@@ -619 +572 @@
-        t=g_strdup_printf(_("%s\n\nCurrent settings:"),msg);
-        g_free(msg); msg=t;
+        t=g_strdup_printf(_("%s\n  status: %s%s%s"),msg,
+                        (user->status?"`":""),
+                        (user->status?user->status:_("not set")),
+                        (user->status?"'":""));
+        g_free(msg); msg=t;
-        t=g_strdup_printf(_("%s\n  friends only: %s"),msg,user->friends_only?_("on"):_("off"));
-        g_free(msg); msg=t;

trunk/src/presence.c

@@ -178 +178 @@
-        xmlnode_put_attrib(pres,"to",to);
-
-
-
-
-
+
+
+
-        if (show){
-                n=xmlnode_insert_tag(pres,"show");
-                xmlnode_insert_cdata(n,show,-1);
-        }
- || available==-1
+
-                n=xmlnode_insert_tag(pres,"status");
-
-
-
-
+
-        }
-        if (timestamp){
@@ -409 +405 @@
-                        else{
-                                Resource *r=session_get_cur_resource(s);
-
+s->user->invisible?-1:
-                                                        r->show,r->status,0);
-                        }

trunk/src/sessions.c

@@ -486 +486 @@
-                        session_send_status(s);
-                        if (s->user->contacts) session_send_notify(s);
-
+s->user->invisible?-1:
-
-                        if (s->timeout_func) g_source_remove(s->timeout_func);
@@ -631 +631 @@
-        }
-        if (s->connected && s->s && s->jid){
-                presence_send(s->s,NULL,s->user->jid,0,NULL,"Offline",0);
-                for(it=s->user->contacts;it;it=it->next){
-                        Contact *c=(Contact *)it->data;
@@ -678 +677 @@
-                return -1;
-        }
-
-
-
-
+
+
-        if (s->user->invisible || r->available==-1){
-
-
+
+
+
+
+
-        }
-        else if (s->user->friends_only) status|=GG_STATUS_FRIENDS_MASK;
@@ -697 +697 @@
-        s->gg_status=status;
-        if (send_presence) {
-
+s->user->invisible?-1:
-        }
-        return 1;
@@ -857 +857 @@
-        if (s->ggs==NULL) return -1;
-        r=session_make_status(s, s->connected);
+        if (r==0) return 0;
+        if (s->gg_status_descr!=NULL){
+                debug(L_("Changing gg status to %i (%s)"),s->gg_status,s->gg_status_descr);
+                gg_change_status_descr(s->ggs,s->gg_status,s->gg_status_descr);
+        }else{
+                debug(L_("Changing gg status to %i"),s->gg_status);
+                gg_change_status(s->ggs,s->gg_status);
+        }
-        if (r==-1) return -1;
-        if (r==0) return 0;
-        debug(L_("Changing gg status to %i"),s->gg_status);
-        if (s->gg_status_descr!=NULL)
-                gg_change_status_descr(s->ggs,s->gg_status,s->gg_status_descr);
-        else
-                gg_change_status(s->ggs,s->gg_status);
-        return 0;
-}
@@ -871 +873 @@
-
-        debug(L_("Removing resource %s of %s"),r->name,s->jid);
+        s->resources=g_list_remove(s->resources,r);
+        /* HACK! when last resource is removed set session description to it's status */
+        if (!s->resources && !s->user->status){
+                g_free(s->gg_status_descr);
+                if(r->status) s->gg_status_descr=g_strdup(r->status);
+                else s->gg_status_descr=NULL;
+        }
+        if (r->disconnect_delay_func){
+                g_source_remove(r->disconnect_delay_func);
+                r->disconnect_delay_func=0;
+        }
-        if (r->name) g_free(r->name);
-        if (r->show) g_free(r->show);
-        if (r->status) g_free(r->status);
-        s->resources=g_list_remove(s->resources,r);
-        if (r->disconnect_delay_func){
-                g_source_remove(r->disconnect_delay_func);
-                r->disconnect_delay_func=0;
-        }
-        g_free(r);
+        session_send_status(s);
-        if (!s->resources && kill_session){
-                session_remove(s);
-                return;
-        }
-        session_send_status(s);
-}
-
@@ -914 +922 @@
-        }
-
+        if ( r ){
+                if (r->show){
+                        g_free(r->show);
+                        r->show=NULL;
+                }
+                if (r->status){
+                        g_free(r->status);
+                        r->status=NULL;
+                }
+        }
+
-        if (!available){
-                if (!r){
@@ -921 +940 @@
-                if (disconnect_delay>0 && r->available && num_resources==1){
-                        r->available=0;
+                        if (status) r->status=g_strndup(status,GG_STATUS_DESCR_MAXSIZE);
+                        r->priority=-1;
-                        debug(L_("Delaying removal of resource %s of %s"),resource?resource:"NULL",s->jid);
-                        r->disconnect_delay_func=g_timeout_add(disconnect_delay*1000,delayed_disconnect,r);
@@ -930 +951 @@
-                if ( r ){
-                        if (r->disconnect_delay_func) g_source_remove(r->disconnect_delay_func);
-                        if (r->show){
-                                g_free(r->show);
-                                r->show=NULL;
-                        }
-                        if (r->status){
-                                g_free(r->status);
-                                r->status=NULL;
-                        }
-                }
-                else{
@@ -948 +961 @@
-                r->available=available;
-                if (show) r->show=g_strdup(show);
- 
+
-                if (priority>=0) r->priority=priority;
-                session_send_status(s);

trunk/src/status.c

@@ -25 +25 @@
-
-        if (status){
+                if (available==-1) return GG_STATUS_INVISIBLE_DESCR;
-                if (!available) return GG_STATUS_NOT_AVAIL_DESCR;
-                else if (!show) return GG_STATUS_AVAIL_DESCR;
@@ -33 +34 @@
-        }
-        else{
+                if (available==-1) return GG_STATUS_INVISIBLE;
-                if (!available) return GG_STATUS_NOT_AVAIL;
-                else if (!show) return GG_STATUS_AVAIL;

trunk/src/users.c

@@ -260 +260 @@
-xmlnode xml,tag,t;
-char *uin,*ujid,*name,*password,*email,*locale;
-,*offline_status,*invisible_status
+
-int last_sys_msg=0,invisible=0,friends_only=0,ignore_unknown=0;
-unsigned int file_format_version=0;
@@ -319 +319 @@
-        if (tag!=NULL) friends_only=1;
-        tag=xmlnode_get_tag(xml,"invisible");
-
-
-
-
-
-
+
-        tag=xmlnode_get_tag(xml,"ignore_unknown");
-        if (tag!=NULL) ignore_unknown=1;
@@ -336 +331 @@
-        }
-        else status=NULL;
-        tag=xmlnode_get_tag(xml,"offline_status");
-        if (tag!=NULL){
-                offline_status=xmlnode_get_data(tag);
-                if (offline_status==NULL) offline_status="";
-        }
-        else offline_status=NULL;
-        tag=xmlnode_get_tag(xml,"userlist");
-        contacts=NULL;
@@ -427 +416 @@
-        u->ignore_unknown=ignore_unknown;
-        u->locale=g_strdup(locale);
-
-
-
+
-        u->contacts=contacts;
-        xmlnode_free(xml);
@@ -471 +458 @@
-        g_free(u->locale);
-        g_free(u->status);
-        g_free(u->offline_status);
-        g_free(u->invisible_status);
-        g_free(u);
-        return 0;

trunk/src/users.h

@@ -62 +62 @@
-        char *locale;
-        char * status;
-        char * offline_status;
-        char * invisible_status;
-
-        int confirmed;