Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mms-engine
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
mer-core
mms-engine
Commits
9ed94503
Commit
9ed94503
authored
Jan 29, 2016
by
Slava Monich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[mms-ofono] Renamed mms-ofono into mms-connman-ofono
parent
86e18c65
Changes
12
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
178 additions
and
178 deletions
+178
-178
mms-connman-ofono/Makefile
mms-connman-ofono/Makefile
+3
-3
mms-connman-ofono/include/mms_connman_ofono.h
mms-connman-ofono/include/mms_connman_ofono.h
+1
-1
mms-connman-ofono/include/mms_connman_ofono_log.h
mms-connman-ofono/include/mms_connman_ofono_log.h
+6
-6
mms-connman-ofono/mms-connman-ofono.pro
mms-connman-ofono/mms-connman-ofono.pro
+5
-6
mms-connman-ofono/src/mms_connection_ofono.c
mms-connman-ofono/src/mms_connection_ofono.c
+64
-64
mms-connman-ofono/src/mms_connection_ofono.h
mms-connman-ofono/src/mms_connection_ofono.h
+2
-2
mms-connman-ofono/src/mms_connman_ofono.c
mms-connman-ofono/src/mms_connman_ofono.c
+65
-65
mms-engine/Makefile
mms-engine/Makefile
+21
-21
mms-engine/main.c
mms-engine/main.c
+3
-3
mms-engine/mms-engine.pro
mms-engine/mms-engine.pro
+5
-4
mms-engine/mms_engine.c
mms-engine/mms_engine.c
+2
-2
mms.pro
mms.pro
+1
-1
No files found.
mms-ofono/Makefile
→
mms-
connman-
ofono/Makefile
View file @
9ed94503
...
...
@@ -16,8 +16,8 @@ all: debug release
#
SRC
=
\
mms_
ofono_connection
.c
\
mms_
ofono_connman
.c
mms_
connection_ofono
.c
\
mms_
connman_ofono
.c
#
# Directories
...
...
@@ -82,7 +82,7 @@ $(RELEASE_OBJS): | $(RELEASE_BUILD_DIR)
#
# Rules
#
LIB
=
libmms-ofono.a
LIB
=
libmms-
connman-
ofono.a
DEBUG_LIB
=
$(DEBUG_BUILD_DIR)
/
$(LIB)
RELEASE_LIB
=
$(RELEASE_BUILD_DIR)
/
$(LIB)
...
...
mms-
ofono/include/mms_ofono_connman
.h
→
mms-
connman-ofono/include/mms_connman_ofono
.h
View file @
9ed94503
/*
* Copyright (C) 2013-201
5
Jolla Ltd.
* Copyright (C) 2013-201
6
Jolla Ltd.
* Contact: Slava Monich <slava.monich@jolla.com>
*
* This program is free software; you can redistribute it and/or modify
...
...
mms-
ofono/include/mms
_ofono_log.h
→
mms-
connman-ofono/include/mms_connman
_ofono_log.h
View file @
9ed94503
/*
* Copyright (C) 2013-201
5
Jolla Ltd.
* Copyright (C) 2013-201
6
Jolla Ltd.
* Contact: Slava Monich <slava.monich@jolla.com>
*
* This program is free software; you can redistribute it and/or modify
...
...
@@ -13,17 +13,17 @@
*
*/
#ifndef JOLLA_MMS_OFONO_LOG_H
#define JOLLA_MMS_OFONO_LOG_H
#ifndef JOLLA_MMS_
CONNMAN_
OFONO_LOG_H
#define JOLLA_MMS_
CONNMAN_
OFONO_LOG_H
#include "mms_log.h"
#define MMS_
OFONO
_LOG_MODULES(log) \
#define MMS_
CONNMAN
_LOG_MODULES(log) \
log(gofono_log)
MMS_
OFONO
_LOG_MODULES
(
GLOG_MODULE_DECL
)
MMS_
CONNMAN
_LOG_MODULES
(
GLOG_MODULE_DECL
)
#endif
/* JOLLA_MMS_OFONO_LOG_H */
#endif
/* JOLLA_MMS_
CONNMAN_
OFONO_LOG_H */
/*
* Local Variables:
...
...
mms-
ofono/mms
-ofono.pro
→
mms-
connman-ofono/mms-connman
-ofono.pro
View file @
9ed94503
...
...
@@ -16,13 +16,12 @@ CONFIG(debug, debug|release) {
}
SOURCES
+=
\
src
/
mms_
ofono_connection
.
c
\
src
/
mms_
ofono_connman
.
c
src
/
mms_
connection_ofono
.
c
\
src
/
mms_
connman_ofono
.
c
HEADERS
+=
\
src
/
mms_ofono_connection
.
h
\
src
/
mms_ofono_context
.
h
src
/
mms_connection_ofono
.
h
HEADERS
+=
\
include
/
mms_
ofono_connman
.
h
\
include
/
mms_ofono_log
.
h
include
/
mms_
connman_ofono
.
h
\
include
/
mms_
connman_
ofono_log
.
h
mms-
ofono/src/mms_ofono_connection
.c
→
mms-
connman-ofono/src/mms_connection_ofono
.c
View file @
9ed94503
This diff is collapsed.
Click to expand it.
mms-
ofono/src/mms_ofono_connection
.h
→
mms-
connman-ofono/src/mms_connection_ofono
.h
View file @
9ed94503
/*
* Copyright (C) 2013-201
5
Jolla Ltd.
* Copyright (C) 2013-201
6
Jolla Ltd.
* Contact: Slava Monich <slava.monich@jolla.com>
*
* This program is free software; you can redistribute it and/or modify
...
...
@@ -21,7 +21,7 @@
#include <gofono_types.h>
MMSConnection
*
mms_
ofono_connection
_new
(
mms_
connection_ofono
_new
(
OfonoSimMgr
*
sim
,
OfonoConnCtx
*
context
,
gboolean
user_request
);
...
...
mms-
ofono/src/mms_ofono_connman
.c
→
mms-
connman-ofono/src/mms_connman_ofono
.c
View file @
9ed94503
This diff is collapsed.
Click to expand it.
mms-engine/Makefile
View file @
9ed94503
...
...
@@ -2,7 +2,7 @@
.PHONY
:
all debug release clean cleaner
.PHONY
:
mms_lib_debug_lib mms_lib_release_lib
.PHONY
:
mms_
ofono_debug_lib mms_ofono
_release_lib
.PHONY
:
mms_
connman_debug_lib mms_connman
_release_lib
.PHONY
:
mms_handler_debug_lib mms_handler_release_lib
.PHONY
:
mms_settings_debug_lib mms_settings_release_lib
...
...
@@ -55,14 +55,14 @@ MMS_LIB_DEBUG_LIB = $(MMS_LIB_BUILD_DIR)/debug/$(MMS_LIB_LIB)
MMS_LIB_RELEASE_LIB
=
$(MMS_LIB_BUILD_DIR)
/release/
$(MMS_LIB_LIB)
#
# mms-
ofono
# mms-
connman
#
MMS_
OFONO_LIB
=
libmms
-ofono.a
MMS_
OFONO_DIR
=
../mms
-ofono
MMS_
OFONO_BUILD_DIR
=
$(MMS_OFONO
_DIR)
/build
MMS_
OFONO_DEBUG_LIB
=
$(MMS_OFONO_BUILD_DIR)
/debug/
$(MMS_OFONO
_LIB)
MMS_
OFONO_RELEASE_LIB
=
$(MMS_OFONO_BUILD_DIR)
/release/
$(MMS_OFONO
_LIB)
MMS_
CONNMAN_LIB
=
libmms-connman
-ofono.a
MMS_
CONNMAN_DIR
=
../mms-connman
-ofono
MMS_
CONNMAN_BUILD_DIR
=
$(MMS_CONNMAN
_DIR)
/build
MMS_
CONNMAN_DEBUG_LIB
=
$(MMS_CONNMAN_BUILD_DIR)
/debug/
$(MMS_CONNMAN
_LIB)
MMS_
CONNMAN_RELEASE_LIB
=
$(MMS_CONNMAN_BUILD_DIR)
/release/
$(MMS_CONNMAN
_LIB)
#
# mms-handler-dbus
...
...
@@ -96,7 +96,7 @@ DEBUG_DEFS = -DDEBUG
RELEASE_DEFS
=
WARN
=
-Wall
CFLAGS
=
-fPIC
$(
shell
pkg-config
--cflags
$(PKGS)
)
-I
.
-I
$(GEN_DIR)
\
-I
$(MMS_LIB_DIR)
/include
-I
$(MMS_
OFONO
_DIR)
/include
\
-I
$(MMS_LIB_DIR)
/include
-I
$(MMS_
CONNMAN
_DIR)
/include
\
-I
$(MMS_HANDLER_DIR)
/include
-I
$(MMS_SETTINGS_DIR)
/include
-MMD
ifndef
KEEP_SYMBOLS
...
...
@@ -117,13 +117,13 @@ RELEASE_CFLAGS = $(RELEASE_FLAGS) $(RELEASE_DEFS) $(CFLAGS)
LIBS
=
$(
shell
pkg-config
--libs
$(LIB_PKGS)
)
-lmagic
-ljpeg
$(RESIZE_LIBS)
DEBUG_LIBS
=
\
$(MMS_
OFONO
_DEBUG_LIB)
\
$(MMS_
CONNMAN
_DEBUG_LIB)
\
$(MMS_HANDLER_DEBUG_LIB)
\
$(MMS_SETTINGS_DEBUG_LIB)
\
$(MMS_LIB_DEBUG_LIB)
\
$(LIBS)
RELEASE_LIBS
=
\
$(MMS_
OFONO
_RELEASE_LIB)
\
$(MMS_
CONNMAN
_RELEASE_LIB)
\
$(MMS_HANDLER_RELEASE_LIB)
\
$(MMS_SETTINGS_RELEASE_LIB)
\
$(MMS_LIB_RELEASE_LIB)
\
...
...
@@ -148,22 +148,22 @@ GEN_FILES = $(GEN_SRC:%=$(GEN_DIR)/%)
DEBUG_DEPS
=
\
mms_lib_debug_lib
\
mms_
ofono
_debug_lib
\
mms_
connman
_debug_lib
\
mms_handler_debug_lib
\
mms_settings_debug_lib
RELEASE_DEPS
=
\
mms_lib_release_lib
\
mms_
ofono
_release_lib
\
mms_
connman
_release_lib
\
mms_handler_release_lib
\
mms_settings_release_lib
DEBUG_EXE_DEPS
=
\
$(MMS_LIB_DEBUG_LIB)
\
$(MMS_
OFONO
_DEBUG_LIB)
\
$(MMS_
CONNMAN
_DEBUG_LIB)
\
$(MMS_HANDLER_DEBUG_LIB)
\
$(MMS_SETTINGS_DEBUG_LIB)
RELEASE_EXE_DEPS
=
\
$(MMS_LIB_RELEASE_LIB)
\
$(MMS_
OFONO
_RELEASE_LIB)
\
$(MMS_
CONNMAN
_RELEASE_LIB)
\
$(MMS_HANDLER_RELEASE_LIB)
\
$(MMS_SETTINGS_RELEASE_LIB)
DEPS
=
$(DEBUG_OBJS:%.o=%.d)
$(RELEASE_OBJS:%.o=%.d)
...
...
@@ -194,7 +194,7 @@ clean:
cleaner
:
clean
make
-C
$(MMS_LIB_DIR)
$(SUBMAKE_OPTS)
clean
make
-C
$(MMS_
OFONO
_DIR)
$(SUBMAKE_OPTS)
clean
make
-C
$(MMS_
CONNMAN
_DIR)
$(SUBMAKE_OPTS)
clean
make
-C
$(MMS_HANDLER_DIR)
$(SUBMAKE_OPTS)
clean
make
-C
$(MMS_SETTINGS_DIR)
$(SUBMAKE_OPTS)
clean
...
...
@@ -213,11 +213,11 @@ mms_lib_debug_lib:
mms_lib_release_lib
:
make
-C
$(MMS_LIB_DIR)
$(SUBMAKE_OPTS)
release
mms_
ofono
_debug_lib
:
make
-C
$(MMS_
OFONO
_DIR)
$(SUBMAKE_OPTS)
debug
mms_
connman
_debug_lib
:
make
-C
$(MMS_
CONNMAN
_DIR)
$(SUBMAKE_OPTS)
debug
mms_
ofono
_release_lib
:
make
-C
$(MMS_
OFONO
_DIR)
$(SUBMAKE_OPTS)
release
mms_
connman
_release_lib
:
make
-C
$(MMS_
CONNMAN
_DIR)
$(SUBMAKE_OPTS)
release
mms_handler_debug_lib
:
make
-C
$(MMS_HANDLER_DIR)
$(SUBMAKE_OPTS)
debug
...
...
@@ -235,9 +235,9 @@ $(MMS_LIB_DEBUG_LIB): mms_lib_debug_lib
$(MMS_LIB_RELEASE_LIB)
:
mms_lib_release_lib
$(MMS_
OFONO_DEBUG_LIB)
:
mms_ofono
_debug_lib
$(MMS_
CONNMAN_DEBUG_LIB)
:
mms_connman
_debug_lib
$(MMS_
OFONO_RELEASE_LIB)
:
mms_ofono
_release_lib
$(MMS_
CONNMAN_RELEASE_LIB)
:
mms_connman
_release_lib
$(MMS_HANDLER_DEBUG_LIB)
:
mms_handler_debug_lib
...
...
mms-engine/main.c
View file @
9ed94503
/*
* Copyright (C) 2013-201
5
Jolla Ltd.
* Copyright (C) 2013-201
6
Jolla Ltd.
* Contact: Slava Monich <slava.monich@jolla.com>
*
* This program is free software; you can redistribute it and/or modify
...
...
@@ -17,7 +17,7 @@
#include <glib-unix.h>
#include "mms_engine.h"
#include "mms_ofono_log.h"
#include "mms_
connman_
ofono_log.h"
#include "mms_lib_log.h"
#include "mms_lib_util.h"
#include "mms_settings.h"
...
...
@@ -41,7 +41,7 @@ static MMSLogModule* mms_app_log_modules[] = {
&
mms_log_default
,
#define MMS_LIB_LOG_MODULE(m) &(m),
MMS_LIB_LOG_MODULES
(
MMS_LIB_LOG_MODULE
)
MMS_
OFONO
_LOG_MODULES
(
MMS_LIB_LOG_MODULE
)
MMS_
CONNMAN
_LOG_MODULES
(
MMS_LIB_LOG_MODULE
)
#undef MMS_LIB_LOG_MODULE
};
...
...
mms-engine/mms-engine.pro
View file @
9ed94503
...
...
@@ -4,10 +4,11 @@ PKGCONFIG += gmime-2.6 gio-unix-2.0 gio-2.0 glib-2.0 libsoup-2.4 dconf
PKGCONFIG
+=
libwspcodec
libgofono
libglibutil
DBUS_INTERFACE_DIR
=
$$
_PRO_FILE_PWD_
MMS_LIB_DIR
=
$$
_PRO_FILE_PWD_
/../
mms
-
lib
MMS_OFONO_DIR
=
$$
_PRO_FILE_PWD_
/../
mms
-
ofono
MMS_CONNMAN
=
mms
-
connman
-
ofono
MMS_CONNMAN_DIR
=
$$
_PRO_FILE_PWD_
/../
$$
MMS_CONNMAN
MMS_HANDLER_DIR
=
$$
_PRO_FILE_PWD_
/../
mms
-
handler
-
dbus
MMS_SETTINGS_DIR
=
$$
_PRO_FILE_PWD_
/../
mms
-
settings
-
dconf
INCLUDEPATH
+=
$$
MMS_
OFONO
_DIR
/
include
INCLUDEPATH
+=
$$
MMS_
CONNMAN
_DIR
/
include
INCLUDEPATH
+=
$$
MMS_LIB_DIR
/
include
INCLUDEPATH
+=
$$
MMS_HANDLER_DIR
/
include
INCLUDEPATH
+=
$$
MMS_SETTINGS_DIR
/
include
...
...
@@ -34,13 +35,13 @@ OTHER_FILES += \
CONFIG
(
debug
,
debug
|
release
)
{
DEFINES
+=
DEBUG
DESTDIR
=
$$
_PRO_FILE_PWD_
/
build
/
debug
LIBS
+=
$$
MMS_
OFONO_DIR
/
build
/
debug
/
libmms
-
ofono
.
a
LIBS
+=
$$
MMS_
CONNMAN_DIR
/
build
/
debug
/
lib
$$
{
MMS_CONNMAN
}
.
a
LIBS
+=
$$
MMS_HANDLER_DIR
/
build
/
debug
/
libmms
-
handler
-
dbus
.
a
LIBS
+=
$$
MMS_LIB_DIR
/
build
/
debug
/
libmms
-
lib
.
a
LIBS
+=
$$
MMS_SETTINGS_DIR
/
build
/
debug
/
libmms
-
settings
-
dconf
.
a
}
else
{
DESTDIR
=
$$
_PRO_FILE_PWD_
/
build
/
release
LIBS
+=
$$
MMS_
OFONO_DIR
/
build
/
release
/
libmms
-
ofono
.
a
LIBS
+=
$$
MMS_
CONNMAN_DIR
/
build
/
release
/
lib
$$
{
MMS_CONNMAN
}
.
a
LIBS
+=
$$
MMS_HANDLER_DIR
/
build
/
release
/
libmms
-
handler
-
dbus
.
a
LIBS
+=
$$
MMS_LIB_DIR
/
build
/
release
/
libmms
-
lib
.
a
LIBS
+=
$$
MMS_SETTINGS_DIR
/
build
/
release
/
libmms
-
settings
-
dconf
.
a
...
...
mms-engine/mms_engine.c
View file @
9ed94503
/*
* Copyright (C) 2013-201
5
Jolla Ltd.
* Copyright (C) 2013-201
6
Jolla Ltd.
* Contact: Slava Monich <slava.monich@jolla.com>
*
* This program is free software; you can redistribute it and/or modify
...
...
@@ -17,7 +17,7 @@
#include "mms_dispatcher.h"
#include "mms_settings.h"
#include "mms_lib_util.h"
#include "mms_
ofono_connman
.h"
#include "mms_
connman_ofono
.h"
#include "mms_handler_dbus.h"
#include "mms_settings_dconf.h"
#include "mms_log.h"
...
...
mms.pro
View file @
9ed94503
...
...
@@ -2,8 +2,8 @@ TEMPLATE = subdirs
CONFIG
+=
ordered
SUBDIRS
+=
\
mms
-
lib
\
mms
-
connman
-
ofono
\
mms
-
handler
-
dbus
\
mms
-
ofono
\
mms
-
settings
-
dconf
\
mms
-
engine
\
mms
-
dump
\
...
...
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