← Back to branch summary

~ubuntu-branches/ubuntu/utopic/linphone/utopic-proposed

« back to all changes in this revision

Viewing changes to gtk-glade/propertybox.c

  • Committer: Bazaar Package Importer
  • Author(s): Mark Purcell
  • Date: 2010-05-23 10:04:07 UTC
  • mfrom: (1.3.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20100523100407-wev5qrmhwwbs0whh
Tags: 3.3.0-1
http://bugs.debian.org/582661
http://bugs.debian.org/582665
http://bugs.debian.org/561708
http://bugs.debian.org/542595
* New upstream release

* debian/control: s/is a is an/is an/ (Closes: #582661)
* debian/control s/It main/Its main/ (Closes: #582665) 
* configure --disable-strict (Closes: 561708)
* Cleanup arches libv4l-dev libasound2-dev (Closes: #542595)
* Cleanup debian/watch
* Drop fix_desktop_section.dpatch - included upstream
* Drop desktop-icon.dpatch - included upstream
* Drop always_ipv4_for_ipv4_hosts.dpatch - included upstream
* Drop dpatch
* Upstream dropped /usr/bin/sipomatic

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtk-glade/propertybox.c
71
71
        const char *username=gtk_entry_get_text(GTK_ENTRY(linphone_gtk_get_widget(pb,"username")));
72
72
        const char *displayname=gtk_entry_get_text(GTK_ENTRY(linphone_gtk_get_widget(pb,"displayname")));
73
73
        int port=linphone_core_get_sip_port(linphone_gtk_get_core());
74
 
        osip_from_t *parsed=linphone_core_get_primary_contact_parsed(linphone_gtk_get_core());
 
74
        LinphoneAddress *parsed=linphone_core_get_primary_contact_parsed(linphone_gtk_get_core());
75
75
        char *contact;
76
76
        g_return_if_fail(parsed!=NULL);
77
77
        if (username[0]=='\0') return;
78
 
        if (port!=5060)
79
 
                contact=g_strdup_printf("%s <sip:%s@%s:%i>",displayname,username,parsed->url->host,port);
80
 
        else
81
 
                contact=g_strdup_printf("%s <sip:%s@%s>",displayname,username,parsed->url->host);
 
78
 
 
79
        linphone_address_set_display_name(parsed,displayname);
 
80
        linphone_address_set_username(parsed,username);
 
81
        linphone_address_set_port_int(parsed,port);
 
82
        contact=linphone_address_as_string(parsed);
82
83
        gtk_entry_set_text(GTK_ENTRY(linphone_gtk_get_widget(pb,"sip_address")),contact);
83
84
        linphone_core_set_primary_contact(linphone_gtk_get_core(),contact);
84
 
        g_free(contact);
 
85
        ms_free(contact);
 
86
        linphone_address_destroy(parsed);
85
87
        linphone_gtk_load_identities();
86
88
}
87
89
 
209
211
}
210
212
 
211
213
void linphone_gtk_echo_cancelation_toggled(GtkWidget *w){
212
 
        linphone_core_enable_echo_cancelation(linphone_gtk_get_core(),
 
214
        linphone_core_enable_echo_cancellation(linphone_gtk_get_core(),
213
215
                gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)));
214
216
}
215
217
 
225
227
        CODEC_NCOLUMNS
226
228
};
227
229
 
 
230
static void fmtp_edited(GtkCellRendererText *renderer, gchar *path, gchar *new_text, gpointer userdata){
 
231
        GtkListStore *store=(GtkListStore*)userdata;
 
232
        GtkTreeIter iter;
 
233
        if (gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(store),&iter,path)){
 
234
                PayloadType *pt;
 
235
                gtk_list_store_set(store,&iter,CODEC_PARAMS,new_text,-1);
 
236
                gtk_tree_model_get(GTK_TREE_MODEL(store),&iter,CODEC_PRIVDATA,&pt,-1);
 
237
                payload_type_set_recv_fmtp(pt,new_text);
 
238
        }
 
239
}
 
240
 
228
241
static void linphone_gtk_init_codec_list(GtkTreeView *listview){
229
242
        GtkCellRenderer *renderer;
230
243
        GtkTreeViewColumn *column;
266
279
                                                "foreground",CODEC_COLOR,
267
280
                                                   NULL);
268
281
        gtk_tree_view_append_column (listview, column);
 
282
        renderer = gtk_cell_renderer_text_new ();
269
283
        column = gtk_tree_view_column_new_with_attributes (_("Parameters"),
270
284
                                                   renderer,
271
285
                                                   "text", CODEC_PARAMS,
272
286
                                                "foreground",CODEC_COLOR,
 
287
                                        "editable",TRUE,
273
288
                                                   NULL);
 
289
        g_signal_connect(G_OBJECT(renderer),"edited",G_CALLBACK(fmtp_edited),store);
274
290
        gtk_tree_view_append_column (listview, column);
275
291
        /* Setup the selection handler */
276
292
        select = gtk_tree_view_get_selection (listview);
293
309
                gchar *color;
294
310
                const char *params="";
295
311
                struct _PayloadType *pt=(struct _PayloadType *)elem->data;
296
 
                if (payload_type_enabled(pt)) status=_("Enabled");
 
312
                if (linphone_core_payload_type_enabled(linphone_gtk_get_core(),pt)) status=_("Enabled");
297
313
                else status=_("Disabled");
298
314
                if (linphone_core_check_payload_type_usability(linphone_gtk_get_core(),pt)) color="blue";
299
315
                else color="red";
309
325
                                        CODEC_PARAMS,params,
310
326
                                        CODEC_PRIVDATA,(gpointer)pt,
311
327
                                        CODEC_COLOR,(gpointer)color,
312
 
                                        CODEC_INFO,(gpointer)payload_type_get_description(pt),
 
328
                                        CODEC_INFO,(gpointer)linphone_core_get_payload_type_description(linphone_gtk_get_core(),pt),
313
329
                                        -1);
314
330
        }
315
331
        
431
447
        if (gtk_tree_selection_get_selected(sel,&mod,&iter)){
432
448
                store=GTK_LIST_STORE(mod);
433
449
                gtk_tree_model_get(mod,&iter,CODEC_PRIVDATA,&pt,-1);
434
 
                payload_type_set_enable(pt,enabled);
 
450
                linphone_core_enable_payload_type(linphone_gtk_get_core(),pt,enabled);
435
451
                gtk_list_store_set(store,&iter,CODEC_STATUS, enabled ? _("Enabled") : _("Disabled"), -1);
436
452
        }
437
453
}
698
714
        }
699
715
}
700
716
 
 
717
static void linphone_gtk_ui_level_adapt(GtkWidget *top) {
 
718
        gboolean ui_advanced;
 
719
        const char *simple_ui = linphone_gtk_get_ui_config("simple_ui", "parameters.codec_tab parameters.transport_frame parameters.ports_frame");
 
720
 
 
721
        ui_advanced = linphone_gtk_get_ui_config_int("advanced_ui", TRUE);
 
722
        if (ui_advanced) {
 
723
                linphone_gtk_visibility_set(simple_ui, "parameters", top, TRUE);
 
724
        } else {
 
725
                linphone_gtk_visibility_set(simple_ui, "parameters", top, FALSE);
 
726
        }
 
727
}
 
728
 
 
729
void linphone_gtk_ui_level_toggled(GtkWidget *w) {
 
730
        gint ui_advanced;
 
731
        GtkWidget *top;
 
732
 
 
733
        top = gtk_widget_get_toplevel(w);
 
734
        ui_advanced = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w));
 
735
        linphone_gtk_set_ui_config_int("advanced_ui", ui_advanced);
 
736
        linphone_gtk_ui_level_adapt(top);
 
737
}
 
738
 
701
739
void linphone_gtk_show_parameters(void){
702
740
        GtkWidget *pb=linphone_gtk_create_window("parameters");
703
741
        LinphoneCore *lc=linphone_gtk_get_core();
704
742
        const char **sound_devices=linphone_core_get_sound_devices(lc);
705
743
        const char *tmp;
706
 
        osip_from_t *contact;
 
744
        LinphoneAddress *contact;
707
745
        LinphoneFirewallPolicy pol;
708
746
        GtkWidget *codec_list=linphone_gtk_get_widget(pb,"codec_list");
709
747
        int mtu;
 
748
        int ui_advanced;
 
749
 
710
750
        /* NETWORK CONFIG */
711
751
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(pb,"ipv6_enabled")),
712
752
                                linphone_core_ipv6_enabled(lc));
755
795
                                        linphone_core_get_video_device(lc),CAP_IGNORE);
756
796
        linphone_gtk_fill_video_sizes(linphone_gtk_get_widget(pb,"video_size"));
757
797
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(pb,"echo_cancelation")),
758
 
                                        linphone_core_echo_cancelation_enabled(lc));
 
798
                                        linphone_core_echo_cancellation_enabled(lc));
759
799
 
760
800
        gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(linphone_gtk_get_widget(pb,"ring_chooser")),
761
801
                                        linphone_core_get_ring(lc));
762
802
        /* SIP CONFIG */
763
803
        contact=linphone_core_get_primary_contact_parsed(lc);
764
804
        if (contact){
765
 
                if (contact->displayname) 
766
 
                        gtk_entry_set_text(GTK_ENTRY(linphone_gtk_get_widget(pb,"displayname")),contact->displayname);
767
 
                if (contact->url->username)
768
 
                        gtk_entry_set_text(GTK_ENTRY(linphone_gtk_get_widget(pb,"username")),contact->url->username);
 
805
                if (linphone_address_get_display_name(contact)) 
 
806
                        gtk_entry_set_text(GTK_ENTRY(linphone_gtk_get_widget(pb,"displayname")),linphone_address_get_display_name(contact));
 
807
                if (linphone_address_get_username(contact))
 
808
                        gtk_entry_set_text(GTK_ENTRY(linphone_gtk_get_widget(pb,"username")),linphone_address_get_username(contact));
769
809
        }
 
810
        linphone_address_destroy(contact);
770
811
        linphone_gtk_show_sip_accounts(pb);
771
812
        /* CODECS CONFIG */
772
813
        linphone_gtk_init_codec_list(GTK_TREE_VIEW(codec_list));
776
817
        gtk_spin_button_set_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(pb,"upload_bw")),
777
818
                                linphone_core_get_upload_bandwidth(lc));
778
819
 
 
820
        /* UI CONFIG */
779
821
        linphone_gtk_fill_langs(pb);
 
822
        ui_advanced = linphone_gtk_get_ui_config_int("advanced_ui", 1);
 
823
        linphone_gtk_set_ui_config_int("advanced_ui", ui_advanced);
 
824
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(pb,"ui_level")),
 
825
                                ui_advanced);
 
826
        linphone_gtk_ui_level_adapt(pb);
 
827
 
780
828
        gtk_widget_show(pb);
781
829
}