DeforaOS/Phone
DeforaOS/Phone
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The project now depends on libSystem (for configuration files)

Browse Source
This commit is contained in:
Pierre Pronchery 2010-05-12 14:27:46 +00:00
parent 0ab9951439
commit eb727c8b55
3 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Makefile
View File

@ -4,10 +4,11 @@ DESTDIR =
BINDIR = $(PREFIX)/bin BINDIR = $(PREFIX)/bin
CC = cc CC = cc
CPPFLAGSF= CPPFLAGSF=
CPPFLAGS= CPPFLAGS= -I $(PREFIX)/include
CFLAGSF = -W CFLAGSF = -W
CFLAGS = -Wall -g -O2 -pedantic `pkg-config --cflags gtk+-2.0` CFLAGS = -Wall -g -O2 -pedantic `pkg-config --cflags gtk+-2.0`
LDFLAGSF= `pkg-config --libs gtk+-2.0` LDFLAGSF= `pkg-config --libs gtk+-2.0` -lSystem
LDFLAGS = -L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/libs
RM = rm -f RM = rm -f
LN = ln -f LN = ln -f
MKDIR = mkdir -p MKDIR = mkdir -p

31
src/phone.c
View File

@ -23,6 +23,7 @@
#include <errno.h> #include <errno.h>
#include <libintl.h> #include <libintl.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <System.h>
#include "gsm.h" #include "gsm.h"
#include "callbacks.h" #include "callbacks.h"
#include "phone.h" #include "phone.h"
@ -73,6 +74,7 @@ struct _Phone
{ {
GSM * gsm; GSM * gsm;
guint ui_source; guint ui_source;
Config * config;
/* status */ /* status */
PhoneSignal signal; PhoneSignal signal;
@ -145,6 +147,10 @@ struct _Phone
}; };
/* constants */
#define PHONE_CONFIG_FILE ".phone"
/* prototypes */ /* prototypes */
static GtkWidget * _phone_create_button(char const * icon, char const * label); static GtkWidget * _phone_create_button(char const * icon, char const * label);
static GtkWidget * _phone_create_dialpad(Phone * phone, static GtkWidget * _phone_create_dialpad(Phone * phone,
@ -189,6 +195,7 @@ void phone_show_debug(Phone * phone, gboolean show);
#endif #endif
/* functions */ /* functions */
/* phone_new */ /* phone_new */
static void _new_config(Phone * phone);
static gboolean _new_idle(gpointer data); static gboolean _new_idle(gpointer data);
static gboolean _on_plug_delete_event(gpointer data); static gboolean _on_plug_delete_event(gpointer data);
static void _on_plug_embedded(gpointer data); static void _on_plug_embedded(gpointer data);
@ -210,7 +217,8 @@ Phone * phone_new(char const * device, unsigned int baudrate, int retry,
if(device == NULL) if(device == NULL)
device = "/dev/modem"; device = "/dev/modem";
phone->gsm = gsm_new(device, baudrate, hwflow); phone->gsm = gsm_new(device, baudrate, hwflow);
phone->ui_source = g_idle_add(_new_idle, phone); phone->ui_source = 0;
_new_config(phone);
phone->signal = -1; phone->signal = -1;
phone->tr_source = 0; phone->tr_source = 0;
memset(&phone->tracks, 0, sizeof(phone->tracks)); memset(&phone->tracks, 0, sizeof(phone->tracks));
@ -264,6 +272,7 @@ Phone * phone_new(char const * device, unsigned int baudrate, int retry,
phone_delete(phone); phone_delete(phone);
return NULL; return NULL;
} }
phone->ui_source = g_idle_add(_new_idle, phone);
if(retry >= 0) if(retry >= 0)
gsm_set_retry(phone->gsm, retry); gsm_set_retry(phone->gsm, retry);
gsm_set_callback(phone->gsm, _phone_gsm_event, phone); gsm_set_callback(phone->gsm, _phone_gsm_event, phone);
@ -271,6 +280,24 @@ Phone * phone_new(char const * device, unsigned int baudrate, int retry,
return phone; return phone;
} }
static void _new_config(Phone * phone)
{
char const * homedir;
size_t len;
char * filename;
if((phone->config = config_new()) == NULL)
return;
if((homedir = getenv("HOME")) == NULL)
homedir = g_get_home_dir();
len = strlen(homedir) + 1 + sizeof(PHONE_CONFIG_FILE);
if((filename = malloc(len)) == NULL)
return;
snprintf(filename, len, "%s/%s", homedir, PHONE_CONFIG_FILE);
config_load(phone->config, filename); /* we can ignore errors */
free(filename);
}
static gboolean _new_idle(gpointer data) static gboolean _new_idle(gpointer data)
{ {
Phone * phone = data; Phone * phone = data;
@ -303,6 +330,8 @@ static void _on_plug_embedded(gpointer data)
/* phone_delete */ /* phone_delete */
void phone_delete(Phone * phone) void phone_delete(Phone * phone)
{ {
if(phone->config != NULL)
config_delete(phone->config);
if(phone->ui_source != 0) if(phone->ui_source != 0)
g_source_remove(phone->ui_source); g_source_remove(phone->ui_source);
if(phone->tr_source != 0) if(phone->tr_source != 0)

4
src/project.conf
View File

@ -1,7 +1,9 @@
targets=phone,phone-contacts,phone-dialer,phone-messages targets=phone,phone-contacts,phone-dialer,phone-messages
cppflags=-I $(PREFIX)/include
cflags_force=-W cflags_force=-W
cflags=-Wall -g -O2 -pedantic `pkg-config --cflags gtk+-2.0` cflags=-Wall -g -O2 -pedantic `pkg-config --cflags gtk+-2.0`
ldflags_force=`pkg-config --libs gtk+-2.0` ldflags_force=`pkg-config --libs gtk+-2.0` -lSystem
ldflags=-L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/libs
dist=Makefile,callbacks.h,command.h,gsm.h,modem.h,phone.h,common.c dist=Makefile,callbacks.h,command.h,gsm.h,modem.h,phone.h,common.c
[phone-contacts] [phone-contacts]