Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
03ae69cf
Commit
03ae69cf
authored
13 years ago
by
Tristan Matthews
Browse files
Options
Downloads
Patches
Plain Diff
* #12303: call gtk_init earlier
parent
80d4942b
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
gnome/src/main.c
+10
-11
10 additions, 11 deletions
gnome/src/main.c
with
10 additions
and
11 deletions
gnome/src/main.c
+
10
−
11
View file @
03ae69cf
...
...
@@ -57,15 +57,6 @@ main(int argc, char *argv[])
signal
(
SIGHUP
,
signal_handler
);
signal
(
SIGTERM
,
signal_handler
);
GError
*
error
=
NULL
;
// Handle logging
int
i
;
// Check arguments if debug mode is activated
for
(
i
=
0
;
i
<
argc
;
i
++
)
if
(
g_strcmp0
(
argv
[
i
],
"--debug"
)
==
0
)
set_log_level
(
LOG_DEBUG
);
#if !GTK_CHECK_VERSION(2,32,0)
g_thread_init
(
NULL
);
gdk_threads_init
();
...
...
@@ -75,6 +66,13 @@ main(int argc, char *argv[])
// Start GTK application
gtk_init
(
&
argc
,
&
argv
);
// Handle logging
// Check arguments if debug mode is activated
for
(
int
i
=
0
;
i
<
argc
;
i
++
)
if
(
g_strcmp0
(
argv
[
i
],
"--debug"
)
==
0
)
set_log_level
(
LOG_DEBUG
);
g_print
(
"%s %s
\n
"
,
PACKAGE
,
VERSION
);
g_print
(
"
\n
Copyright (c) 2005 - 2012 Savoir-faire Linux Inc.
\n\n
"
);
g_print
(
"This is free software. You may redistribute copies of it under the terms of
\n
"
\
...
...
@@ -93,9 +91,10 @@ main(int argc, char *argv[])
srand
(
time
(
NULL
));
// Internationalization
bindtextdomain
(
"sflphone-client-gnome"
,
LOCALEDIR
);
textdomain
(
"sflphone-client-gnome"
);
bindtextdomain
(
PACKAGE
,
LOCALEDIR
);
textdomain
(
PACKAGE
);
GError
*
error
=
NULL
;
if
(
!
sflphone_init
(
&
error
))
{
ERROR
(
"%s"
,
error
->
message
);
GtkWidget
*
dialog
=
gtk_message_dialog_new
(
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment