Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-client-gnome
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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-client-gnome
Commits
66c50a32
Commit
66c50a32
authored
10 years ago
by
Edric Milaret
Committed by
Stepan Salenikovich
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
gnome: fix compilation on gnome 3.16.1
Refs #72584 Change-Id: I975c2423f973c1bd834a95f796bf5e8d797bc905
parent
6e7b092f
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/backends/edscontactbackend.cpp
+7
-2
7 additions, 2 deletions
src/backends/edscontactbackend.cpp
src/backends/edscontactbackend.h
+1
-1
1 addition, 1 deletion
src/backends/edscontactbackend.h
with
8 additions
and
3 deletions
src/backends/edscontactbackend.cpp
+
7
−
2
View file @
66c50a32
...
@@ -67,9 +67,14 @@ registry_cb(G_GNUC_UNUSED GObject *source, GAsyncResult *result, GCancellable *c
...
@@ -67,9 +67,14 @@ registry_cb(G_GNUC_UNUSED GObject *source, GAsyncResult *result, GCancellable *c
ESource
*
source
=
E_SOURCE
(
l
->
data
);
ESource
*
source
=
E_SOURCE
(
l
->
data
);
/* try to connect to each source ansynch */
/* try to connect to each source ansynch */
#if EDS_CHECK_VERSION(3,16,0)
#if EDS_CHECK_VERSION(3,16,0)
e_book_client_connect
(
source
,
WAIT_FOR_CONNECTED_SECONDS
,
cancellable
,
(
GAsyncReadyCallback
)
client_cb
,
NULL
);
e_book_client_connect
(
source
,
#endif
EdsContactBackend
::
WAIT_FOR_CONNECTED_SECONDS
,
cancellable
,
(
GAsyncReadyCallback
)
client_cb
,
NULL
);
#else
e_book_client_connect
(
source
,
cancellable
,
(
GAsyncReadyCallback
)
client_cb
,
NULL
);
e_book_client_connect
(
source
,
cancellable
,
(
GAsyncReadyCallback
)
client_cb
,
NULL
);
#endif
}
}
g_list_free_full
(
list
,
g_object_unref
);
g_list_free_full
(
list
,
g_object_unref
);
...
...
This diff is collapsed.
Click to expand it.
src/backends/edscontactbackend.h
+
1
−
1
View file @
66c50a32
...
@@ -69,7 +69,7 @@ public:
...
@@ -69,7 +69,7 @@ public:
* authentication requests. In case the backend will not connect within the
* authentication requests. In case the backend will not connect within the
* set interval, then it is opened in an offline mode. A special value -1
* set interval, then it is opened in an offline mode. A special value -1
* can be used to not wait for the connected state at all.
* can be used to not wait for the connected state at all.
*
*/
*/
constexpr
static
guint32
WAIT_FOR_CONNECTED_SECONDS
{
5
};
constexpr
static
guint32
WAIT_FOR_CONNECTED_SECONDS
{
5
};
#endif
#endif
...
...
This diff is collapsed.
Click to expand it.
Jami Bot
@RingBot
mentioned in commit
24d9962e
·
7 years ago
mentioned in commit
24d9962e
mentioned in commit 24d9962e88c67c54692d29e015205917f9560888
Toggle commit list
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