Skip to content

Commit 643e8ff

Browse files
cgwaltersColin Walters
authored and
Colin Walters
committed
Autogenerate about dialog stuff from AUTHORS and DOCUMENTORS.
2003-07-28 Colin Walters <[email protected]> * AUTHORS: * DOCUMENTERS: * HACKING: * INTERNALS: * Makefile.am: * shell/Makefile.am: * shell/rb-shell.c: (rb_shell_cmd_about), (rb_shell_cmd_new_station): Autogenerate about dialog stuff from AUTHORS and DOCUMENTORS. Make "New Internet Radio Station" menu entry work. Minor updates to HACKING and INTERNALS.
1 parent 408b215 commit 643e8ff

File tree

8 files changed

+100
-51
lines changed

8 files changed

+100
-51
lines changed

AUTHORS

+14-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
Jorn Baayen <[email protected]>
2-
Marco Pesenti Gritti <[email protected]>
3-
Bastien Nocera <[email protected]>
4-
Seth Nickell <[email protected]>
5-
Olivier Martin <[email protected]>
62
Colin Walters <[email protected]>
3+
Bastien Nocera <[email protected]>
4+
Marco Pesenti Gritti <[email protected]>
5+
Kenneth Christiansen <[email protected]>
6+
Mark Finlay <[email protected]>
7+
Mark Humphreys <[email protected]>
8+
Laurens Krol <[email protected]>
9+
Xan Lopez <[email protected]>
10+
Olivier Martin <[email protected]>
11+
Seth Nickell <[email protected]>
12+
Jan Arne Petersen <[email protected]>
13+
Kristian Rietveld <[email protected]>
14+
Christian Schaller <[email protected]>
15+
Dennis Smit <[email protected]>
16+
James Willcox <[email protected]>

ChangeLog

+17
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
2003-07-28 Colin Walters <[email protected]>
2+
3+
* AUTHORS:
4+
* DOCUMENTERS:
5+
* HACKING:
6+
* INTERNALS:
7+
* Makefile.am:
8+
* shell/Makefile.am:
9+
* shell/rb-shell.c: (rb_shell_cmd_about),
10+
(rb_shell_cmd_new_station):
11+
12+
Autogenerate about dialog stuff from AUTHORS and DOCUMENTORS.
13+
14+
Make "New Internet Radio Station" menu entry work.
15+
16+
Minor updates to HACKING and INTERNALS.
17+
118
2003-07-28 Colin Walters <[email protected]>
219

320
* configure.in: Don't use -Werror by default, for now.

DOCUMENTERS

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Luca Ferretti <[email protected]>
2+
Mark Finlay <[email protected]>
3+
Mark Humphreys <[email protected]>

HACKING

+16-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,22 @@ In order to keep the code nice and clean we have a few requirements you'll
22
need to stick to in order to get your patch accepted:
33

44
- use 8-space tabs for indentation
5-
- curly brackets are NOT on a new line (we are slowly converting the code)
5+
- curly brackets are NOT on a new line, except for function definitions.
6+
(we are slowly converting the code)
7+
8+
Here is a correctly indented sample:
9+
10+
void
11+
foo (const char *bla, gpointer cow)
12+
{
13+
if (!strcmp (bla, cow)) {
14+
g_print ("moo!");
15+
return;
16+
}
17+
18+
...
19+
}
20+
621
- if statements are written like this: "if (this != that)"
722
- g_list_next/previous is preferred to list->next or list->previous
823
- every function should have a prototype

INTERNALS

+1-6
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ The Library is the main part of Rhythmbox; it is the thing that lets
6161
you play local files. We'll go over some of the most important things,
6262
and then come back to it later once we know more.
6363

64-
*** RBNode, RBNodeSong
64+
*** RBNode
6565

6666
Understanding RBNode (library/rb-node.c) is crucial. RBNode is not
6767
just used by the Library actually; every other source uses it as well.
@@ -74,11 +74,6 @@ types; e.g. a string, integer, or a pointer to another node.
7474
These dynamic properties pretty much correspond to the song
7575
metadata you can see like song length, duration, location, etc.
7676

77-
However, the songs are not represented directly by RBNode instances.
78-
Instead, the library has a subclass of RBNode called RBNodeSong. This
79-
is subclass just is a bit more convenient to work with for the library
80-
than RBNode directly.
81-
8277
**** The tree structure
8378
So where does the parent/children relationship come in?
8479
Rhythmbox maintains a sort of database of your music. This is what

Makefile.am

-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,3 @@ CLEANFILES = \
1717
./intltool-extract \
1818
./intltool-merge \
1919
./intltool-update
20-

shell/Makefile.am

+20-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
2+
AUTHORS.tab : $(top_srcdir)/AUTHORS
3+
cat $(top_srcdir)/AUTHORS | sed -e 's/^/"/' -e 's/$$/",/' > $@.tmp
4+
mv $@.tmp $@
5+
6+
MAINTAINERS.tab : $(top_srcdir)/MAINTAINERS
7+
cat $(top_srcdir)/MAINTAINERS | sed -e 's/^/"/' -e 's/$$/",/' > $@.tmp
8+
mv $@.tmp $@
9+
10+
DOCUMENTERS.tab : $(top_srcdir)/DOCUMENTERS
11+
cat $(top_srcdir)/DOCUMENTERS | sed -e 's/^/"/' -e 's/$$/",/' > $@.tmp
12+
mv $@.tmp $@
13+
14+
tab_files = AUTHORS.tab MAINTAINERS.tab DOCUMENTERS.tab
15+
116
bin_PROGRAMS = rhythmbox
217

318
rhythmbox_interface_idl_sources = \
@@ -55,12 +70,16 @@ INCLUDES = \
5570

5671
CLEAN_FILES = $(rhythmbox_interface_idl_sources)
5772

58-
Rhythmbox-common.c Rhythmbox-stubs.c Rhythmbox-skels.c Rhythmbox.h: Rhythmbox.idl
73+
$(rhythmbox_interface_idl_sources): Rhythmbox.idl
5974
$(ORBIT_IDL) -I $(LIBBONOBO_IDL) -I $(BONOBO_ACTIVATION_IDL) $(srcdir)/Rhythmbox.idl
6075

76+
BUILT_SOURCES = $(rhythmbox_interface_idl_sources) $(tab_files)
77+
6178
EXTRA_DIST = Rhythmbox.idl
6279

6380
CLEANFILES = \
81+
AUTHORS.tab \
82+
MAINTAINERS.tab \
6483
Rhythmbox-common.c \
6584
Rhythmbox-stubs.c \
6685
Rhythmbox-skels.c \

shell/rb-shell.c

+29-38
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,9 @@ static void rb_shell_cmd_load_playlist (BonoboUIComponent *component,
151151
static void rb_shell_cmd_new_playlist (BonoboUIComponent *component,
152152
RBShell *shell,
153153
const char *verbname);
154-
/* static void rb_shell_cmd_new_station (BonoboUIComponent *component, */
155-
/* RBShell *shell, */
156-
/* const char *verbname); */
154+
static void rb_shell_cmd_new_station (BonoboUIComponent *component,
155+
RBShell *shell,
156+
const char *verbname);
157157
static void rb_shell_cmd_delete_group (BonoboUIComponent *component,
158158
RBShell *shell,
159159
const char *verbname);
@@ -289,7 +289,7 @@ static BonoboUIVerb rb_shell_verbs[] =
289289
BONOBO_UI_VERB ("AddLocation", (BonoboUIVerbFn) rb_shell_cmd_add_location),
290290
BONOBO_UI_VERB ("LoadPlaylist", (BonoboUIVerbFn) rb_shell_cmd_load_playlist),
291291
BONOBO_UI_VERB ("NewPlaylist", (BonoboUIVerbFn) rb_shell_cmd_new_playlist),
292-
/* BONOBO_UI_VERB ("NewStation", (BonoboUIVerbFn) rb_shell_cmd_new_station), */
292+
BONOBO_UI_VERB ("NewStation", (BonoboUIVerbFn) rb_shell_cmd_new_station),
293293
BONOBO_UI_VERB ("RenamePlaylist",(BonoboUIVerbFn) rb_shell_cmd_rename_group),
294294
BONOBO_UI_VERB ("DeletePlaylist",(BonoboUIVerbFn) rb_shell_cmd_delete_group),
295295
BONOBO_UI_VERB_END
@@ -1073,38 +1073,23 @@ rb_shell_cmd_about (BonoboUIComponent *component,
10731073
RBShell *shell,
10741074
const char *verbname)
10751075
{
1076+
const char **tem;
10761077
static GtkWidget *about = NULL;
10771078
GdkPixbuf *pixbuf = NULL;
10781079

10791080
const char *authors[] =
10801081
{
10811082
"",
1082-
"Jorn Baayen ([email protected])",
1083-
"Colin Walters ([email protected])",
1083+
#include "MAINTAINERS.tab"
10841084
"",
1085-
"",
1086-
"Kenneth Christiansen ([email protected])",
1087-
"Mark Finlay ([email protected])",
1088-
"Marco Pesenti Gritti ([email protected])",
1089-
"Mark Humphreys ([email protected])",
1090-
"Laurens Krol ([email protected])",
1091-
"Xan Lopez ([email protected])",
1092-
"Olivier Martin ([email protected])",
1093-
"Seth Nickell ([email protected])",
1094-
"Bastien Nocera ([email protected])",
1095-
"Jan Arne Petersen ([email protected])",
1096-
"Kristian Rietveld ([email protected])",
1097-
"Christian Schaller ([email protected])",
1098-
"Dennis Smit ([email protected])",
1099-
"James Willcox ([email protected])",
1085+
NULL,
1086+
#include "AUTHORS.tab"
11001087
NULL
11011088
};
11021089

11031090
const char *documenters[] =
11041091
{
1105-
"Luca Ferretti ([email protected])",
1106-
"Mark Finlay ([email protected])",
1107-
"Mark Humphreys ([email protected])",
1092+
#include "DOCUMENTERS.tab"
11081093
NULL
11091094
};
11101095

@@ -1118,8 +1103,15 @@ rb_shell_cmd_about (BonoboUIComponent *component,
11181103

11191104
pixbuf = gdk_pixbuf_new_from_file (rb_file ("about-logo.png"), NULL);
11201105

1121-
authors[0] = _("Lead developers:");
1122-
authors[4] = _("Contributors:");
1106+
authors[0] = _("Maintainers:");
1107+
tem = authors;
1108+
while (1) {
1109+
if (*tem == NULL) {
1110+
*tem = _("Contributors:");
1111+
break;
1112+
}
1113+
tem++;
1114+
}
11231115

11241116
about = gnome_about_new ("Rhythmbox", VERSION,
11251117
"Copyright \xc2\xa9 2002, 2003 Jorn Baayen, Colin Walters",
@@ -1449,18 +1441,17 @@ rb_shell_cmd_delete_group (BonoboUIComponent *component,
14491441
}
14501442

14511443

1452-
/* static void */
1453-
/* rb_shell_cmd_new_station (BonoboUIComponent *component, */
1454-
/* RBShell *shell, */
1455-
/* const char *verbname) */
1456-
/* { */
1457-
/* GtkWidget *dialog; */
1458-
/* rb_debug ("Got new station command"); */
1459-
/* dialog = rb_new_station_dialog_new (shell->priv->iradio_backend); */
1460-
/* gtk_dialog_run (GTK_DIALOG (dialog)); */
1461-
/* gtk_widget_destroy (dialog); */
1462-
/* } */
1463-
1444+
static void
1445+
rb_shell_cmd_new_station (BonoboUIComponent *component,
1446+
RBShell *shell,
1447+
const char *verbname)
1448+
{
1449+
GtkWidget *dialog;
1450+
rb_debug ("Got new station command");
1451+
dialog = rb_new_station_dialog_new (shell->priv->iradio_backend);
1452+
gtk_dialog_run (GTK_DIALOG (dialog));
1453+
gtk_widget_destroy (dialog);
1454+
}
14641455

14651456
static void
14661457
rb_shell_quit (RBShell *shell)

0 commit comments

Comments
 (0)