Mercurial > pidgin.yaz
changeset 606:eaab8abda2c0
[gaim-migrate @ 616]
ok, a few changes.
1) --enable-gnome (which is the default) can make sounds go through gnome,
which means they're configurable. they can still go through gaim.
2) --enable-gnome will also install the necessary files to make sounds
through gnome work.
3) the rpm will be built without gnome; if a distributor later wants to
require gnome that's up to them.
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Fri, 04 Aug 2000 17:13:54 +0000 |
| parents | 1dbc72baf900 |
| children | 01a9c6998719 |
| files | Makefile.am configure.in gaim.soundlist gaim.spec.in gaim_applet.soundlist sounds/Makefile.am src/prefs.c src/sound.c |
| diffstat | 8 files changed, 66 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am Fri Aug 04 05:36:02 2000 +0000 +++ b/Makefile.am Fri Aug 04 17:13:54 2000 +0000 @@ -15,12 +15,33 @@ gaimdesktopdir = $(gnomedata)/applets/Network gaimdesktop_DATA = $(gaim_DESKTOP) -gaim_SOUND = gaim_applet.soundlist +gaim_SOUND = gaim.soundlist gaimsounddir = $(gnomesysconf)/sound/events gaimsound_DATA = $(gaim_SOUND) endif +if DISTRIB + +distribgnorbadir = $(sysconfdir)/CORBA/servers +distribgnorba_DATA = gaim_applet.gnorba + +distribdesktopdir = $(datadir)/applets/Network +distribdesktop_DATA = gaim_applet.desktop + +distribsounddir = $(sysconfdir)/sound/events +distribsound_DATA = gaim.soundlist + +endif + +if GNOMEBITS + +bitssysconf = `@GNOME_CONFIG@ --sysconfdir` +bitssounddir = $(bitssysconf)/sound/events +bitssound_DATA = gaim.soundlist + +endif + pixmapdir = $(datadir)/gnome/apps/Internet pixmap_DATA = gaim.desktop
--- a/configure.in Fri Aug 04 05:36:02 2000 +0000 +++ b/configure.in Fri Aug 04 17:13:54 2000 +0000 @@ -80,11 +80,14 @@ CFLAGS="$CFLAGS $GNOME_CFLAGS" LIBS="$LIBS `$gnomepath gnomeui --libs 2>/dev/null`" AC_DEFINE(USE_GNOME) + GNOME_CONFIG="$gnomepath" + AC_SUBST(GNOME_CONFIG) AC_PATH_PROG(gaimpath, gaim) fi fi fi fi +AM_CONDITIONAL(GNOMEBITS, test "x$enable_gnome" = "xyes") if test "x$enable_gnome" != "xyes" ; then AM_PATH_GLIB(1.2.0)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gaim.soundlist Fri Aug 04 17:13:54 2000 +0000 @@ -0,0 +1,18 @@ +[__section_info__] +description=Gaim soundlist + +[login] +file=gaim/BuddyArrive.au +description=User signed on + +[leave] +file=gaim/BuddyLeave.au +description=User signed off + +[send] +file=gaim/Send.au +description=Send a message + +[recv] +file=gaim/Receive.au +description=Receive a message
--- a/gaim.spec.in Fri Aug 04 05:36:02 2000 +0000 +++ b/gaim.spec.in Fri Aug 04 17:13:54 2000 +0000 @@ -49,7 +49,7 @@ %setup %build -CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} +CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} --disable-gnome make if [ -d $RPM_BUILD_ROOT ]; then rm -r $RPM_BUILD_ROOT; fi; mkdir -p $RPM_BUILD_ROOT%{prefix} @@ -70,6 +70,7 @@ %{prefix}/share/pixmaps/gaim.xpm %{prefix}/share/gnome/apps/Internet/gaim.desktop + %files applet %defattr(-,root,root) %attr(755,root,root) %{prefix}/bin/gaim_applet @@ -80,6 +81,9 @@ %{prefix}/share/pixmaps/gaim.xpm %{prefix}/share/pixmaps/gaim/gnome/* %{prefix}/share/gnome/apps/Internet/gaim.desktop +/etc/CORBA/servers/* +%{prefix}/share/applets/Network/* +/etc/sound/events/* %clean rm -r $RPM_BUILD_ROOT
--- a/gaim_applet.soundlist Fri Aug 04 05:36:02 2000 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -[__section_info__] -description=Gaim soundlist - -[login] -file=gaim/BuddyArrive.au -description=User signed on - -[leave] -file=gaim/BuddyLeave.au -description=User signed off - -[send] -file=gaim/Send.au -description=Send a message - -[recv] -file=gaim/Receive.au -description=Receive a message
--- a/sounds/Makefile.am Fri Aug 04 05:36:02 2000 +0000 +++ b/sounds/Makefile.am Fri Aug 04 17:13:54 2000 +0000 @@ -31,3 +31,9 @@ gaimdistribdir = $(datadir)/sounds/gaim gaimdistrib_DATA = $(EXTRA_DIST) endif + +if GNOMEBITS +bitsdata = `@GNOME_CONFIG@ --datadir` +bitssoundsdir = $(bitsdata)/sounds/gaim +bitssounds_DATA = $(EXTRA_DIST) +endif
--- a/src/prefs.c Fri Aug 04 05:36:02 2000 +0000 +++ b/src/prefs.c Fri Aug 04 17:13:54 2000 +0000 @@ -447,7 +447,6 @@ gtk_box_pack_start(GTK_BOX(applet_page), appletbox, TRUE, TRUE, 5); gaim_button(_("Automatically Show Buddy List"), &general_options, OPT_GEN_APP_BUDDY_SHOW, appletbox); - gaim_button(_("Sounds go through GNOME"), &sound_options, OPT_SOUND_THROUGH_GNOME, appletbox); gaim_button(_("Buddy list displays near the applet"), &general_options, OPT_GEN_NEAR_APPLET, appletbox); gtk_widget_show(appletbox); @@ -678,6 +677,7 @@ label = gtk_label_new(_("Sounds")); gtk_widget_show(label); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), sound_page, label); + gaim_button(_("Sounds go through GNOME"), &sound_options, OPT_SOUND_THROUGH_GNOME, sound_page); gaim_button(_("Sound when buddy logs in"), &sound_options, OPT_SOUND_LOGIN, sound_page); gaim_button(_("Sound when buddy logs out"), &sound_options, OPT_SOUND_LOGOUT, sound_page); gaim_button(_("Sound when message is received"), &sound_options, OPT_SOUND_RECV, sound_page);
--- a/src/sound.c Fri Aug 04 05:36:02 2000 +0000 +++ b/src/sound.c Fri Aug 04 17:13:54 2000 +0000 @@ -266,8 +266,8 @@ extern int logins_not_muted; -#ifdef USE_APPLET -void applet_play_sound(int sound) +#ifdef USE_GNOME +void gnome_play_sound(int sound) #else void play_sound(int sound) #endif @@ -301,43 +301,43 @@ } } -#ifdef USE_APPLET +#ifdef USE_GNOME #include <gnome.h> void play_sound(int sound) { if (!(sound_options & OPT_SOUND_THROUGH_GNOME)) { - applet_play_sound(sound); + gnome_play_sound(sound); return; } switch(sound) { case BUDDY_ARRIVE: if ((sound_options & OPT_SOUND_LOGIN) && logins_not_muted) - gnome_triggers_do("", "program", "gaim_applet", "login", NULL); + gnome_triggers_do("", "program", "gaim", "login", NULL); break; case BUDDY_LEAVE: if (sound_options & OPT_SOUND_LOGOUT) - gnome_triggers_do("", "program", "gaim_applet", "leave", NULL); + gnome_triggers_do("", "program", "gaim", "leave", NULL); break; case SEND: if (sound_options & OPT_SOUND_SEND) - gnome_triggers_do("", "program", "gaim_applet", "send", NULL); + gnome_triggers_do("", "program", "gaim", "send", NULL); break; case FIRST_RECEIVE: if (sound_options & OPT_SOUND_FIRST_RCV) - gnome_triggers_do("", "program", "gaim_applet", "recv", NULL); + gnome_triggers_do("", "program", "gaim", "recv", NULL); break; case RECEIVE: if (sound_options & OPT_SOUND_RECV) - gnome_triggers_do("", "program", "gaim_applet", "recv", NULL); + gnome_triggers_do("", "program", "gaim", "recv", NULL); break; case AWAY: if (sound_options & OPT_SOUND_WHEN_AWAY) - gnome_triggers_do("", "program", "gaim_applet", "recv", NULL); + gnome_triggers_do("", "program", "gaim", "recv", NULL); break; } } -#endif /* USE_APPLET */ +#endif /* USE_GNOME */