Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
BC
public
liblinphone
Commits
100e8e90
Commit
100e8e90
authored
Mar 24, 2014
by
Margaux Clerc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add audio assistant start icon
parent
9de8fe1b
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
26 additions
and
5 deletions
+26
-5
.gitignore
.gitignore
+1
-0
configure.ac
configure.ac
+1
-0
gtk/audio_assistant.c
gtk/audio_assistant.c
+6
-2
gtk/linphone.h
gtk/linphone.h
+1
-0
gtk/main.c
gtk/main.c
+4
-0
share/Makefile.am
share/Makefile.am
+4
-3
share/audio-assistant.desktop.in
share/audio-assistant.desktop.in
+9
-0
No files found.
.gitignore
View file @
100e8e90
...
...
@@ -41,6 +41,7 @@ Specfile
.anjuta_sym_db.db
gtk-glade/version_date.h
share/linphone.desktop
share/audio-assistant.desktop
Debug/
build/macos/Info-linphone.plist
coreapi/help/Doxyfile
...
...
configure.ac
View file @
100e8e90
...
...
@@ -900,6 +900,7 @@ AC_CONFIG_FILES([
share/xml/Makefile
share/linphone.pc
share/linphone.desktop
share/audio-assistant.desktop
scripts/Makefile
tools/Makefile
linphone.spec
...
...
gtk/audio_assistant.c
View file @
100e8e90
...
...
@@ -407,10 +407,14 @@ static void prepare(GtkAssistant *w){
void
linphone_gtk_close_audio_assistant
(
GtkWidget
*
w
){
gchar
*
path
=
g_object_get_data
(
G_OBJECT
(
audio_assistant
),
"path"
);
g_unlink
(
path
);
if
(
path
!=
NULL
){
g_unlink
(
path
);
}
gtk_widget_destroy
(
w
);
if
(
linphone_gtk_get_audio_assistant_option
()){
gtk_main_quit
();
}
audio_assistant
=
NULL
;
linphone_gtk_show_main_window
();
}
void
linphone_gtk_audio_assistant_apply
(
GtkWidget
*
w
){
...
...
gtk/linphone.h
View file @
100e8e90
...
...
@@ -189,6 +189,7 @@ gchar *linphone_gtk_get_record_path(const LinphoneAddress *address, gboolean is_
void
linphone_gtk_schedule_restart
(
void
);
void
linphone_gtk_show_audio_assistant
(
void
);
gboolean
linphone_gtk_get_audio_assistant_option
(
void
);
void
linphone_gtk_set_configuration_uri
(
void
);
GtkWidget
*
linphone_gtk_show_config_fetching
(
void
);
...
...
gtk/main.c
View file @
100e8e90
...
...
@@ -271,6 +271,10 @@ void linphone_gtk_schedule_restart(void){
restart
=
TRUE
;
}
gboolean
linphone_gtk_get_audio_assistant_option
(
void
){
return
run_audio_assistant
;
}
static
void
linphone_gtk_init_liblinphone
(
const
char
*
config_file
,
const
char
*
factory_config_file
,
const
char
*
db_file
)
{
LinphoneCoreVTable
vtable
=
{
0
};
...
...
share/Makefile.am
View file @
100e8e90
...
...
@@ -23,7 +23,7 @@ ring_DATA=$(LINPHONE_RINGS)
#to be compliant with freedesktop.org:
linphone_fddir
=
$(datadir)
/applications
linphone_fd_DATA
=
linphone.desktop
linphone_fd_DATA
=
linphone.desktop
audio-assistant.desktop
pkgconfigdir
=
$(libdir)
/pkgconfig
...
...
@@ -43,9 +43,10 @@ rootca.pem:
cp
-f
$(srcdir)
/archived-rootca.pem
$(builddir)
/rootca.pem
;
\
fi
EXTRA_DIST
=
$(LINPHONE_SOUNDS)
\
EXTRA_DIST
=
$(LINPHONE_SOUNDS)
\
$(LINPHONE_RINGS)
\
linphone.desktop.in
\
linphone.desktop.in
\
audio-assistant.desktop.in
\
linphone.pc.in
\
Makefile.inc
\
archived-rootca.pem
...
...
share/audio-assistant.desktop.in
0 → 100644
View file @
100e8e90
[Desktop Entry]
Name=Audio assistant
Comment=Linphone audio assistant
Comment[fr]=Assistant audio de Linphone.
Type=Application
Exec=linphone --run-audio-assistant
Icon=/usr/local/share/pixmaps/linphone/linphone.png
Terminal=false
Categories=Network;Telephony;
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment