[maemo-commits] [maemo-commits] r8425 - in projects/haf/trunk/maemo-launcher: . launcher
From: www-data at stage.maemo.org www-data at stage.maemo.orgDate: Tue Nov 28 22:39:35 EET 2006
- Previous message: [maemo-commits] r8424 - projects/haf/trunk/pygtk
- Next message: [maemo-commits] r8426 - in projects/haf/trunk/maemo-launcher: . debian launcher
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: guillem Date: 2006-11-28 22:39:32 +0200 (Tue, 28 Nov 2006) New Revision: 8425 Modified: projects/haf/trunk/maemo-launcher/ChangeLog projects/haf/trunk/maemo-launcher/launcher/Makefile.am projects/haf/trunk/maemo-launcher/launcher/booster.c projects/haf/trunk/maemo-launcher/launcher/booster.h projects/haf/trunk/maemo-launcher/launcher/booster_gtk.c projects/haf/trunk/maemo-launcher/launcher/booster_null.c projects/haf/trunk/maemo-launcher/launcher/comm_dbus.c projects/haf/trunk/maemo-launcher/launcher/comm_dbus.h projects/haf/trunk/maemo-launcher/launcher/defender.c projects/haf/trunk/maemo-launcher/launcher/launcher.c Log: Unbranding (first part). * launcher/comm_dbus.h (MAEMO_LAUNCHER_PATH): Renamed to ... (LAUNCHER_PATH): ... this. Fixed all users. (MAEMO_LAUNCHER_IFACE): Renamed to ... (LAUNCHER_IFACE): ... this. Fixed all users. (MAEMO_LAUNCHER_SIGNAL_APP_DIED): Renamed to ... (LAUNCHER_SIGNAL_APP_DIED): ... this. Fixed all users. * launcher/booster.h (MAEMO_LAUNCHER_BOOSTER_API_VERSION): Renamed to ... (BOOSTER_API_VERSION): ... this. Fixed all users. * launcher/Makefile.am (MAEMO_DEFENDER): Renamed to ... (DEFENDER): ... this. Fixed all users. (MAEMO_LAUNCHER): Renamed to ... (LAUNCHER): ... this. Fixed all users. (MAEMO_BOOSTER_DIR): Renamed to ... (BOOSTER_DIR): ... this. Fixed all users. (MAEMO_BOOSTER_DEFAULT): Renamed to ... (BOOSTER_DEFAULT): ... this. Fixed all users. Modified: projects/haf/trunk/maemo-launcher/ChangeLog =================================================================== --- projects/haf/trunk/maemo-launcher/ChangeLog 2006-11-28 20:39:29 UTC (rev 8424) +++ projects/haf/trunk/maemo-launcher/ChangeLog 2006-11-28 20:39:32 UTC (rev 8425) @@ -1,5 +1,27 @@ 2006-11-28 Guillem Jover <guillem.jover at nokia.com> + Unbranding (first part). + + * launcher/comm_dbus.h (MAEMO_LAUNCHER_PATH): Renamed to ... + (LAUNCHER_PATH): ... this. Fixed all users. + (MAEMO_LAUNCHER_IFACE): Renamed to ... + (LAUNCHER_IFACE): ... this. Fixed all users. + (MAEMO_LAUNCHER_SIGNAL_APP_DIED): Renamed to ... + (LAUNCHER_SIGNAL_APP_DIED): ... this. Fixed all users. + * launcher/booster.h (MAEMO_LAUNCHER_BOOSTER_API_VERSION): Renamed + to ... + (BOOSTER_API_VERSION): ... this. Fixed all users. + * launcher/Makefile.am (MAEMO_DEFENDER): Renamed to ... + (DEFENDER): ... this. Fixed all users. + (MAEMO_LAUNCHER): Renamed to ... + (LAUNCHER): ... this. Fixed all users. + (MAEMO_BOOSTER_DIR): Renamed to ... + (BOOSTER_DIR): ... this. Fixed all users. + (MAEMO_BOOSTER_DEFAULT): Renamed to ... + (BOOSTER_DEFAULT): ... this. Fixed all users. + +2006-11-28 Guillem Jover <guillem.jover at nokia.com> + * configure.ac (GTK_DEPENDS): Add xft. * launcher/booster_gtk.c (booster_gtk_preinit): Call XftInit and XftInitFtLibrary. Modified: projects/haf/trunk/maemo-launcher/launcher/Makefile.am =================================================================== --- projects/haf/trunk/maemo-launcher/launcher/Makefile.am 2006-11-28 20:39:29 UTC (rev 8424) +++ projects/haf/trunk/maemo-launcher/launcher/Makefile.am 2006-11-28 20:39:32 UTC (rev 8425) @@ -6,19 +6,19 @@ helperdir = $(libdir)/maemo-launcher helper_PROGRAMS = maemo-defender -MAEMO_DEFENDER = "\"$(helperdir)/maemo-defender\"" -MAEMO_LAUNCHER = "\"$(bindir)/maemo-launcher\"" +DEFENDER = "\"$(helperdir)/maemo-defender\"" +LAUNCHER = "\"$(bindir)/maemo-launcher\"" maemo_defender_SOURCES = defender.c report.c report.h maemo_defender_CPPFLAGS = \ -DPROG_NAME="\"maemo-defender\"" \ - -DMAEMO_LAUNCHER=$(MAEMO_LAUNCHER) \ - -DMAEMO_DEFENDER=$(MAEMO_DEFENDER) + -DLAUNCHER=$(LAUNCHER) \ + -DDEFENDER=$(DEFENDER) boosterdir = $(libdir)/maemo-launcher booster_PROGRAMS = maemo-booster-null.so maemo-booster-gtk.so -MAEMO_BOOSTER_DIR = "\"$(boosterdir)\"" +BOOSTER_DIR = "\"$(boosterdir)\"" maemo_booster_null_so_SOURCES = booster_null.c maemo_booster_null_so_CFLAGS = -fPIC @@ -39,9 +39,9 @@ maemo_launcher_CPPFLAGS = \ $(DBUS_CFLAGS) \ -DPROG_NAME="\"maemo-launcher\"" \ - -DMAEMO_BOOSTER_DIR=$(MAEMO_BOOSTER_DIR) \ - -DMAEMO_BOOSTER_DEFAULT="\"null\"" \ - -DMAEMO_DEFENDER=$(MAEMO_DEFENDER) + -DBOOSTER_DIR=$(BOOSTER_DIR) \ + -DBOOSTER_DEFAULT="\"null\"" \ + -DDEFENDER=$(DEFENDER) maemo_launcher_LDADD = -ldl $(DBUS_LIBS) # FIXME: Use rdynamic for now until the boosters do not use the report # functions. Modified: projects/haf/trunk/maemo-launcher/launcher/booster.c =================================================================== --- projects/haf/trunk/maemo-launcher/launcher/booster.c 2006-11-28 20:39:29 UTC (rev 8424) +++ projects/haf/trunk/maemo-launcher/launcher/booster.c 2006-11-28 20:39:32 UTC (rev 8425) @@ -36,8 +36,7 @@ char *booster_sym; char *error_s; - asprintf(&booster_path, MAEMO_BOOSTER_DIR "/maemo-booster-%s.so", - booster->name); + asprintf(&booster_path, BOOSTER_DIR "/maemo-booster-%s.so", booster->name); if (!booster_path) die(40, "allocating booster module path\n"); @@ -61,7 +60,7 @@ free(booster_sym); - if (booster->api->booster_version != MAEMO_LAUNCHER_BOOSTER_API_VERSION) + if (booster->api->booster_version != BOOSTER_API_VERSION) die(43, "cannot handle booster module version %d.\n", booster->api->booster_version); } Modified: projects/haf/trunk/maemo-launcher/launcher/booster.h =================================================================== --- projects/haf/trunk/maemo-launcher/launcher/booster.h 2006-11-28 20:39:29 UTC (rev 8424) +++ projects/haf/trunk/maemo-launcher/launcher/booster.h 2006-11-28 20:39:32 UTC (rev 8425) @@ -32,7 +32,7 @@ void (*booster_reload)(booster_state_t state); } booster_api_t; -#define MAEMO_LAUNCHER_BOOSTER_API_VERSION 0 +#define BOOSTER_API_VERSION 0 typedef struct { booster_state_t state; Modified: projects/haf/trunk/maemo-launcher/launcher/booster_gtk.c =================================================================== --- projects/haf/trunk/maemo-launcher/launcher/booster_gtk.c 2006-11-28 20:39:29 UTC (rev 8424) +++ projects/haf/trunk/maemo-launcher/launcher/booster_gtk.c 2006-11-28 20:39:32 UTC (rev 8425) @@ -350,7 +350,7 @@ } booster_api_t booster_gtk_api = { - .booster_version = MAEMO_LAUNCHER_BOOSTER_API_VERSION, + .booster_version = BOOSTER_API_VERSION, .booster_preinit = booster_gtk_preinit, .booster_init = booster_gtk_init, .booster_reload = booster_gtk_reload, Modified: projects/haf/trunk/maemo-launcher/launcher/booster_null.c =================================================================== --- projects/haf/trunk/maemo-launcher/launcher/booster_null.c 2006-11-28 20:39:29 UTC (rev 8424) +++ projects/haf/trunk/maemo-launcher/launcher/booster_null.c 2006-11-28 20:39:32 UTC (rev 8425) @@ -46,7 +46,7 @@ } booster_api_t booster_null_api = { - .booster_version = MAEMO_LAUNCHER_BOOSTER_API_VERSION, + .booster_version = BOOSTER_API_VERSION, .booster_preinit = booster_null_preinit, .booster_init = booster_null_init, .booster_reload = booster_null_reload, Modified: projects/haf/trunk/maemo-launcher/launcher/comm_dbus.c =================================================================== --- projects/haf/trunk/maemo-launcher/launcher/comm_dbus.c 2006-11-28 20:39:29 UTC (rev 8424) +++ projects/haf/trunk/maemo-launcher/launcher/comm_dbus.c 2006-11-28 20:39:32 UTC (rev 8425) @@ -57,9 +57,9 @@ if (!conn) comm_dbus_init(); - msg = dbus_message_new_signal(MAEMO_LAUNCHER_PATH, - MAEMO_LAUNCHER_IFACE, - MAEMO_LAUNCHER_SIGNAL_APP_DIED); + msg = dbus_message_new_signal(LAUNCHER_PATH, + LAUNCHER_IFACE, + LAUNCHER_SIGNAL_APP_DIED); dbus_message_append_args(msg, DBUS_TYPE_STRING, &filename, DBUS_TYPE_INT32, &pid, Modified: projects/haf/trunk/maemo-launcher/launcher/comm_dbus.h =================================================================== --- projects/haf/trunk/maemo-launcher/launcher/comm_dbus.h 2006-11-28 20:39:29 UTC (rev 8424) +++ projects/haf/trunk/maemo-launcher/launcher/comm_dbus.h 2006-11-28 20:39:32 UTC (rev 8425) @@ -23,9 +23,9 @@ #ifndef COMM_DBUS_H #define COMM_DBUS_H -#define MAEMO_LAUNCHER_PATH "/org/maemo/launcher" -#define MAEMO_LAUNCHER_IFACE "org.maemo.launcher" -#define MAEMO_LAUNCHER_SIGNAL_APP_DIED "ApplicationDied" +#define LAUNCHER_PATH "/org/maemo/launcher" +#define LAUNCHER_IFACE "org.maemo.launcher" +#define LAUNCHER_SIGNAL_APP_DIED "ApplicationDied" void comm_send_app_died(char *filename, int pid, int status); Modified: projects/haf/trunk/maemo-launcher/launcher/defender.c =================================================================== --- projects/haf/trunk/maemo-launcher/launcher/defender.c 2006-11-28 20:39:29 UTC (rev 8424) +++ projects/haf/trunk/maemo-launcher/launcher/defender.c 2006-11-28 20:39:32 UTC (rev 8425) @@ -76,7 +76,7 @@ if (snprintf(filename, sizeof(filename), "/proc/%d/exe", ppid) < 0) die(30, "generating filename string: '%s'\n", filename); - return is_same_file(filename, MAEMO_LAUNCHER); + return is_same_file(filename, LAUNCHER); } int Modified: projects/haf/trunk/maemo-launcher/launcher/launcher.c =================================================================== --- projects/haf/trunk/maemo-launcher/launcher/launcher.c 2006-11-28 20:39:29 UTC (rev 8424) +++ projects/haf/trunk/maemo-launcher/launcher/launcher.c 2006-11-28 20:39:32 UTC (rev 8425) @@ -110,7 +110,7 @@ char pidstr[20]; snprintf(pidstr, sizeof(pidstr), "%d", pid); - execl(MAEMO_DEFENDER, MAEMO_DEFENDER, pidstr, NULL); + execl(DEFENDER, DEFENDER, pidstr, NULL); _exit(1); } @@ -674,7 +674,7 @@ "Use the invoker to start a <shared object> from the launcher.\n" "Where <shared object> is a binary including a 'main' symbol.\n" "Note that the binary needs to be linked with -shared or -pie.\n", - PROG_NAME, LAUNCHER_PIDFILE, MAEMO_BOOSTER_DEFAULT); + PROG_NAME, LAUNCHER_PIDFILE, BOOSTER_DEFAULT); exit(status); } @@ -682,7 +682,7 @@ int main(int argc, char *argv[]) { - booster_t booster = { .name = MAEMO_BOOSTER_DEFAULT }; + booster_t booster = { .name = BOOSTER_DEFAULT }; kindergarten_t *childs; const int initial_child_slots = 64; int i;
- Previous message: [maemo-commits] r8424 - projects/haf/trunk/pygtk
- Next message: [maemo-commits] r8426 - in projects/haf/trunk/maemo-launcher: . debian launcher
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]