linuxer/alarm-clock
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: linuxer:0.2.5
Branches Tags
linuxer:master linuxer:1.0.2
linuxer:1.0.1 linuxer:0.3.4 linuxer:0.3.3 linuxer:0.3.2 linuxer:0.3.1 linuxer:0.3.0 linuxer:0.2.6 linuxer:0.2.5 linuxer:0.2.4 linuxer:0.2.3 linuxer:0.2.2 linuxer:0.2.1 linuxer:0.2.0 linuxer:0.1.1
..
compare: linuxer:0.2.6
Branches Tags
linuxer:1.0.2 linuxer:master
linuxer:1.0.1 linuxer:0.3.4 linuxer:0.3.3 linuxer:0.3.2 linuxer:0.3.1 linuxer:0.3.0 linuxer:0.2.6 linuxer:0.2.5 linuxer:0.2.4 linuxer:0.2.3 linuxer:0.2.2 linuxer:0.2.1 linuxer:0.2.0 linuxer:0.1.1

2 Commits
0.2.5 ... 0.2.6

Author SHA1 Message Date
Johannes H. Jensen
54b406024e Change package name to 'alarm-clock-applet' to avoid name conflicts. 
Update to reflect the new location of gnome-default-applications.xml.
Bump to version 0.2.6.
 2009-06-12 10:42:53 +02:00
Johannes H. Jensen
e889812405 Use libexecdir instead of bindir. 2009-05-30 20:18:42 +02:00
4 changed files with 8 additions and 9 deletions
Expand all files Collapse all files

6
configure.ac
View File

@@ -2,9 +2,9 @@ dnl ***************************************************************************
dnl *** configure.ac for ALARM-CLOCK *** dnl *** configure.ac for ALARM-CLOCK ***
dnl *************************************************************************** dnl ***************************************************************************
AC_INIT([Alarm Clock], [0.2.5], AC_INIT([Alarm Clock], [0.2.6],
[Johannes H. Jensen <joh@pseudoberries.com>], [Johannes H. Jensen <joh@pseudoberries.com>],
[alarm-clock]) [alarm-clock-applet])
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
@@ -129,8 +129,6 @@ iconsdir="${datadir}/icons"
AC_SUBST(iconsdir) AC_SUBST(iconsdir)
pixmapsdir="${datadir}/pixmaps" pixmapsdir="${datadir}/pixmaps"
AC_SUBST(pixmapsdir) AC_SUBST(pixmapsdir)
pkgdatadir="${datadir}/alarm-clock"
AC_SUBST(pkgdatadir)
gladedir="${pkgdatadir}/glade" gladedir="${pkgdatadir}/glade"
AC_SUBST(gladedir) AC_SUBST(gladedir)
soundsdir="${datadir}/sounds" soundsdir="${datadir}/sounds"

2
src/AlarmClock.server.in
View File

@@ -1,6 +1,6 @@
<oaf_info> <oaf_info>
<oaf_server iid="OAFIID:AlarmClock_Factory" type="exe" <oaf_server iid="OAFIID:AlarmClock_Factory" type="exe"
location="@BINDIR@/alarm-clock-applet"> location="@LIBEXECDIR@/alarm-clock-applet">
<oaf_attribute name="repo_ids" type="stringv"> <oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/GenericFactory:1.0"/> <item value="IDL:Bonobo/GenericFactory:1.0"/>

4
src/Makefile.am
View File

@@ -13,7 +13,7 @@ INCLUDES = \
$(LIBNOTIFY_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \
-I$(includedir) -I$(includedir)
bin_PROGRAMS = alarm-clock-applet libexec_PROGRAMS = alarm-clock-applet
alarm_clock_applet_SOURCES = alarm-applet.c alarm-applet.h \ alarm_clock_applet_SOURCES = alarm-applet.c alarm-applet.h \
player.c player.h \ player.c player.h \
@@ -39,7 +39,7 @@ server_in_files = AlarmClock.server.in
server_DATA = $(server_in_files:.server.in=.server) server_DATA = $(server_in_files:.server.in=.server)
$(server_DATA): $(server_in_files) $(server_DATA): $(server_in_files)
sed -e "s|\@BINDIR\@|$(bindir)|" $< > $@ sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
uidir = $(gladedir) uidir = $(gladedir)
ui_DATA = ui/alarm-clock.glade ui_DATA = ui/alarm-clock.glade

1
src/alarm-applet.c
View File

@@ -252,6 +252,7 @@ alarm_applet_apps_load (AlarmApplet *applet)
// from gnome-control-center // from gnome-control-center
filename = g_build_filename (DATADIR, filename = g_build_filename (DATADIR,
"gnome-control-center", "gnome-control-center",
"default-apps",
"gnome-default-applications.xml", "gnome-default-applications.xml",
NULL); NULL);