Skip to content
Snippets Groups Projects
Commit 0ba9c4a4 authored by pierre-luc's avatar pierre-luc
Browse files

[#2034] Now useless as Direct Ip calls settings moved under Preferences.

parent 654e013b
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
sflphone-client-gnome/src/config/Makefile.am
+ 0
− 1
View file @ 0ba9c4a4
...@@ -7,7 +7,6 @@ libconfig_la_SOURCES = \ ...@@ -7,7 +7,6 @@ libconfig_la_SOURCES = \
configwindow.c \ configwindow.c \
zrtpadvanceddialog.c \ zrtpadvanceddialog.c \
tlsadvanceddialog.c \ tlsadvanceddialog.c \
ip2ipdialog.c \
accountwindow.c \ accountwindow.c \
hooks-config.c \ hooks-config.c \
audioconf.c \ audioconf.c \
......
sflphone-client-gnome/src/config/configwindow.c
+ 0
− 1
View file @ 0ba9c4a4
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
#include <addressbook-config.h> #include <addressbook-config.h>
#include <hooks-config.h> #include <hooks-config.h>
#include <utils.h> #include <utils.h>
#include <ip2ipdialog.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
......
sflphone-client-gnome/src/config/ip2ipdialog.c deleted 100644 → 0
+ 0
− 152
View file @ 654e013b
/*
* Copyright (C) 2009 Savoir-Faire Linux inc.
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <zrtpadvanceddialog.h>
#include <sflphone_const.h>
#include <utils.h>
#include <gtk/gtk.h>
static void key_exchange_changed_cb(GtkWidget *widget, gpointer data)
{
DEBUG("Key exchange changed");
if (g_strcasecmp(gtk_combo_box_get_active_text(GTK_COMBO_BOX(widget)), (gchar *) "ZRTP") == 0) {
gtk_widget_set_sensitive(GTK_WIDGET(data), TRUE);
} else {
gtk_widget_set_sensitive(GTK_WIDGET(data), FALSE);
}
}
static void show_advanced_zrtp_options_cb(GtkWidget *widget UNUSED, gpointer data)
{
DEBUG("Advanced options for ZRTP");
show_advanced_zrtp_options((GHashTable *) data);
}
void show_ip2ip_dialog(GHashTable * properties)
{
GtkDialog * ip2ipDialog;
GtkWidget * frame;
GtkWidget * table;
GtkWidget * label;
GtkWidget * enableHelloHash;
GtkWidget * enableSASConfirm;
GtkWidget * enableZrtpNotSuppOther;
GtkWidget * displaySasOnce;
GtkWidget * advancedOptions;
GtkWidget * keyExchangeCombo;
gchar * curSasConfirm = "true";
gchar * curHelloEnabled = "true";
gchar * curZrtpNotSuppOther = "true";
gchar * curDisplaySasOnce = "false";
gchar * curSRTPEnabled = "false";
gchar * curKeyExchange = "0";
gchar * description;
if(properties != NULL) {
curSRTPEnabled = g_hash_table_lookup(properties, ACCOUNT_SRTP_ENABLED);
curKeyExchange = g_hash_table_lookup(properties, ACCOUNT_KEY_EXCHANGE);
curHelloEnabled = g_hash_table_lookup(properties, ACCOUNT_ZRTP_HELLO_HASH);
curSasConfirm = g_hash_table_lookup(properties, ACCOUNT_ZRTP_DISPLAY_SAS);
curZrtpNotSuppOther = g_hash_table_lookup(properties, ACCOUNT_ZRTP_NOT_SUPP_WARNING);
curDisplaySasOnce = g_hash_table_lookup(properties, ACCOUNT_DISPLAY_SAS_ONCE);
}
ip2ipDialog = GTK_DIALOG(gtk_dialog_new_with_buttons (_("Direct peer to peer calls"),
GTK_WINDOW(get_main_window()),
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_HELP,
GTK_RESPONSE_HELP,
GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL,
GTK_STOCK_SAVE,
GTK_RESPONSE_ACCEPT,
NULL));
gtk_window_set_policy( GTK_WINDOW(ip2ipDialog), FALSE, FALSE, FALSE );
gtk_dialog_set_has_separator(ip2ipDialog, TRUE);
gtk_container_set_border_width (GTK_CONTAINER(ip2ipDialog), 0);
GtkWidget * vbox = gtk_vbox_new(FALSE, 10);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
gtk_box_pack_start(GTK_BOX(ip2ipDialog->vbox), vbox, FALSE, FALSE, 0);
description = g_markup_printf_escaped(_("This profile is used when you want to reach a remote peer\nby simply typing <b>sip:remotepeer</b> without having to go throught\nan external server. The settings here defined will also apply\nin case no account could be matched to the incoming or\noutgoing call."));
label = gtk_label_new(NULL);
gtk_label_set_markup(GTK_LABEL(label), description);
gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_FILL);
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
/* SRTP Section */
gnome_main_section_new_with_table (_("Security"), &frame, &table, 1, 3);
gtk_container_set_border_width (GTK_CONTAINER(table), 10);
gtk_table_set_row_spacings (GTK_TABLE(table), 10);
gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
label = gtk_label_new_with_mnemonic (_("SRTP key exchange"));
keyExchangeCombo = gtk_combo_box_new_text();
gtk_label_set_mnemonic_widget (GTK_LABEL (label), keyExchangeCombo);
gtk_combo_box_append_text(GTK_COMBO_BOX(keyExchangeCombo), "ZRTP");
//gtk_combo_box_append_text(GTK_COMBO_BOX(keyExchangeCombo), "SDES");
gtk_combo_box_append_text(GTK_COMBO_BOX(keyExchangeCombo), _("Disabled"));
advancedOptions = gtk_button_new_with_label(_("Advanced options"));
g_signal_connect(G_OBJECT(advancedOptions), "clicked", G_CALLBACK(show_advanced_zrtp_options_cb), properties);
DEBUG("curSRTPEnabled = %s\n", curSRTPEnabled);
if (g_strcasecmp(curSRTPEnabled, "false") == 0)
{
gtk_combo_box_set_active(GTK_COMBO_BOX(keyExchangeCombo), 1);
gtk_widget_set_sensitive(GTK_WIDGET(advancedOptions), FALSE);
} else {
DEBUG("curKeyExchange %s \n", curKeyExchange);
if (strcmp(curKeyExchange, ZRTP) == 0) {
gtk_combo_box_set_active(GTK_COMBO_BOX(keyExchangeCombo),0);
} else {
gtk_combo_box_set_active(GTK_COMBO_BOX(keyExchangeCombo), 1);
gtk_widget_set_sensitive(GTK_WIDGET(advancedOptions), FALSE);
}
}
g_signal_connect (G_OBJECT (GTK_COMBO_BOX(keyExchangeCombo)), "changed", G_CALLBACK (key_exchange_changed_cb), advancedOptions);
gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
gtk_table_attach_defaults(GTK_TABLE(table), keyExchangeCombo, 1, 2, 0, 1);
gtk_table_attach_defaults(GTK_TABLE(table), advancedOptions, 2, 3, 0, 1);
gtk_widget_show_all(vbox);
if(gtk_dialog_run(GTK_DIALOG(ip2ipDialog)) == GTK_RESPONSE_ACCEPT) {
gchar* keyExchange = (gchar *)gtk_combo_box_get_active_text(GTK_COMBO_BOX(keyExchangeCombo));
DEBUG("Active text %s\n", keyExchange);
if (g_strcmp0(keyExchange, "ZRTP") == 0) {
g_hash_table_replace(properties, g_strdup(ACCOUNT_SRTP_ENABLED), g_strdup("true"));
} else {
g_hash_table_replace(properties, g_strdup(ACCOUNT_SRTP_ENABLED), g_strdup("false"));
}
dbus_set_ip2ip_details(properties);
}
gtk_widget_destroy (GTK_WIDGET(ip2ipDialog));
}
sflphone-client-gnome/src/config/ip2ipdialog.h deleted 100644 → 0
+ 0
− 34
View file @ 654e013b
/*
* Copyright (C) 2009 Savoir-Faire Linux inc.
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef __SFL_IP2IP_DIALOG__
#define __SFL_IP2IP_DIALOG__
/** @file zrtpadvanceddialog.h
* @brief Display the advanced options window for zrtp
*/
#include <glib.h>
/**
* Display the advanced options window for zrtp
*/
void show_ip2ip_dialog(GHashTable * properties);
#endif
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment