Changeset 772:e4ec0a747f43 in mediastreamer2

Timestamp:

Nov 13, 2009 9:49:50 AM (4 years ago)

Author:

smorlat <smorlat@…>

Branch:

default

Message:

fix several UI bugs with buddylookup

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@760 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

Location:

linphone

Files:

• coreapi/linphonecore.c (modified) (1 diff)
• gtk-glade/buddylookup.c (modified) (1 diff)
• gtk-glade/friendlist.c (modified) (1 diff)
• gtk-glade/main.c (modified) (1 diff)

linphone/coreapi/linphonecore.c

@@ -1096 +1096 @@
                                 if (lf->url->url->username!=NULL && lf->url->url->username[0]!='0'){
                                         BuddyLookupRequest *req;
+                                        char tmp[255];
+                                        snprintf(tmp,sizeof(tmp),"sip:%s@%s",lf->url->url->username,lf->url->url->host);
                                         req=sip_setup_context_create_buddy_lookup_request(ctx);
-                                        buddy_lookup_request_set_key(req,lf->url->url->username);
+                                        buddy_lookup_request_set_key(req,tmp);
                                         buddy_lookup_request_set_max_results(req,1);
                                         sip_setup_context_buddy_lookup_submit(ctx,req);

linphone/gtk-glade/buddylookup.c

@@ -144 +144 @@
         last_state=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w),"last_state"));
 
-        if (req==NULL) return FALSE;
+        if (req==NULL) {
+                g_object_set_data(G_OBJECT(w),"buddylookup_processing",GINT_TO_POINTER(0));
+                return FALSE;
+        }
         bls=req->status;
         if (last_state==bls) return TRUE;
+        
         switch(bls){
                 case BuddyLookupNone:

linphone/gtk-glade/friendlist.c

@@ -273 +273 @@
         linphone_core_get_default_proxy(linphone_gtk_get_core(),&cfg);
         GtkWidget *w=linphone_gtk_show_buddy_lookup_window(linphone_proxy_config_get_sip_setup_context(cfg));
-        linphone_gtk_buddy_lookup_set_keyword(w,gtk_entry_get_text(GTK_ENTRY(entry)));
+        if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(entry),"active"))==1)
+                linphone_gtk_buddy_lookup_set_keyword(w,gtk_entry_get_text(GTK_ENTRY(entry)));
 }
 

linphone/gtk-glade/main.c

@@ -707 +707 @@
 static void linphone_gtk_new_unknown_subscriber(LinphoneCore *lc, LinphoneFriend *lf, const char *url){
         GtkWidget *dialog;
+
+        if (linphone_gtk_get_ui_config_int("subscribe_deny_all",0)){
+                linphone_core_reject_subscriber(linphone_gtk_get_core(),lf);
+                return;
+        }
+
         gchar *message=g_strdup_printf(_("%s would like to add you to his contact list.\nWould you allow him to see your presence status or add him to your contact list ?\nIf you answer no, this person will be temporarily blacklisted."),url);
         dialog = gtk_message_dialog_new (