tvkaista-0.94/Makefile tvkaista-0.95/Makefile
44 rm -f helper.c helper.gz logo.png *~44 rm -f helper.c helper.gz logo.png *~
4545
46distclean: clean46distclean: clean
47 rm tvkaista_gtkui tvkaista_gtk47 rm -f tvkaista_gtkui tvkaista_gtk
4848

tvkaista-0.94/gitlog tvkaista-0.95/gitlog
1commit 7bcf15a6c866deecd68f56b45090bf84e0aa96ef
2Author: Tomi Ollila <too@koti-lappari.(none)>
3Date: Sun Apr 26 19:53:02 2009 +0300
4
5 Vaihdettu kopioitu fd 15:sta 8:aan jotta toimisi dashin kanssa...
6
7M tvkaista_gtkui.c
8
9commit aad810b6a8dba423e958adc8303b35d3315f0511
10Author: Tomi Ollila <too@koti.localdomain>
11Date: Sun Apr 26 18:42:03 2009 +0300
12
13 rm -f in make distclean target
14
15M Makefile
16
17commit f3113b6e64bd412be24bba0c701f1e2b628400ba
18Author: Tomi Ollila <too@koti.localdomain>
19Date: Sun Apr 26 18:41:25 2009 +0300
20
21 more compiler warnings removal
22
23M tvkaista_gtkui.c
24
25commit b827ba1bdb82de5096dfb11992e56c8e58f1fbc6
26Author: Tomi Ollila <too@koti.localdomain>
27Date: Sun Apr 26 18:05:13 2009 +0300
28
29 kääntäjävaroitusten poisto -- pl yksi.
30
31M tvkaista_gtkui.c
32
1commit 5d0d0aa7340b8efdb5ee81990d9ecae460f0b1a133commit 5d0d0aa7340b8efdb5ee81990d9ecae460f0b1a1
2Author: Tomi Ollila <too@iki.fi>34Author: Tomi Ollila <too@iki.fi>
3Date: Sun Apr 26 12:54:36 2009 +030035Date: Sun Apr 26 12:54:36 2009 +0300

tvkaista-0.94/tvkaista.desktop tvkaista-0.95/tvkaista.desktop
1[Desktop Entry]1[Desktop Entry]
2Encoding=UTF-82Encoding=UTF-8
3Version=0.943Version=0.95
4Name=tvkaista4Name=tvkaista
5Comment=gui-kilentti tvkaistalle5Comment=gui-kilentti tvkaistalle
6GenericName=tvkaista-kilentti6GenericName=tvkaista-kilentti

tvkaista-0.94/tvkaista_gtkui.c tvkaista-0.95/tvkaista_gtkui.c
28 * All rights reserved28 * All rights reserved
29 *29 *
30 * Created: Tue Feb 03 19:04:43 EET 2009 too30 * Created: Tue Feb 03 19:04:43 EET 2009 too
31 * Last modified: Sun 26 Apr 2009 11:08:00 EEST too31 * Last modified: su 26. huhtikuuta 2009 18.39.07 too
32 */32 */
3333
34#define _GNU_SOURCE 1 // strcasestr() at least (in string.h).34#define _GNU_SOURCE 1 // strcasestr() at least (in string.h).
153 int l;153 int l;
154154
155 sprintf(cmdline, xterm ?155 sprintf(cmdline, xterm ?
156 /* */ "exec 15>&1; exec xterm -hold -fa '' -fs 10 -e \"%s\" 15 " :156 /* */ "exec 8>&1; exec xterm -hold -fa '' -fs 10 -e \"%s\" 8 " :
157 /* */ "exec \"%s\" 1 ", G_helper);157 /* */ "exec \"%s\" 1 ", G_helper);
158 l = strlen(cmdline);158 l = strlen(cmdline);
159 if (l > 500)159 if (l > 500)
231 }231 }
232 lseek(fd, prginfo->txtoffset, SEEK_SET);232 lseek(fd, prginfo->txtoffset, SEEK_SET);
233 char buf[1024], *p;233 char buf[1024], *p;
234 read(fd, buf, sizeof buf); // XXX234 int l = read(fd, buf, sizeof buf - 1); // XXX
235 if (l > 0)
236 buf[l] = 0;
237 else
238 die("read():");
235 for(p = buf; *p && *p != '\r' && *p != '\n'; p++)239 for(p = buf; *p && *p != '\r' && *p != '\n'; p++)
236 ;240 ;
237 *p = '\0';241 *p = '\0';
284288
285static GtkTreeModel * create_model(void)289static GtkTreeModel * create_model(void)
286{290{
291 W.listfilter = GTK_TREE_MODEL_FILTER(
287 W.listfilter = gtk_tree_model_filter_new(292 gtk_tree_model_filter_new(
288 GTK_TREE_MODEL(gtk_list_store_new(NUM_COLS,293 GTK_TREE_MODEL(gtk_list_store_new(NUM_COLS,
289 G_TYPE_STRING, G_TYPE_STRING,294 G_TYPE_STRING, G_TYPE_STRING,
290 G_TYPE_STRING, G_TYPE_STRING,295 G_TYPE_STRING, G_TYPE_STRING,
291 G_TYPE_UINT)), 0);296 G_TYPE_UINT)), 0));
292#if 0297#if 0
293 liststore = gtk_list_store_new(NUM_COLS,298 liststore = gtk_list_store_new(NUM_COLS,
294 G_TYPE_STRING, G_TYPE_STRING,299 G_TYPE_STRING, G_TYPE_STRING,
302307
303void clear_store(void)308void clear_store(void)
304{309{
305 GtkListStore * liststore = gtk_tree_model_filter_get_model(W.listfilter);310 GtkListStore * liststore
311 = GTK_LIST_STORE(gtk_tree_model_filter_get_model(W.listfilter));
306 gtk_list_store_clear(liststore);312 gtk_list_store_clear(liststore);
307}313}
308314
309int fill_store(FILE * fh)315int fill_store(FILE * fh)
310{316{
311 GtkListStore * liststore = gtk_tree_model_filter_get_model(W.listfilter);317 GtkListStore * liststore
318 = GTK_LIST_STORE(gtk_tree_model_filter_get_model(W.listfilter));
312 GtkTreeIter iter;319 GtkTreeIter iter;
313 char line[1024];320 char line[1024];
314321
325 {332 {
326 char * ptrs[4];333 char * ptrs[4];
327 char * p;334 char * p;
328 fgets(line, sizeof line, fh);335 if (fgets(line, sizeof line, fh) == null)
336 die("fgets():");
329337
330 switch (line[0]) {338 switch (line[0]) {
331 case 'F':339 case 'F':
660 GtkWidget * dialog = gtk_message_dialog_new(GTK_WINDOW(W.w),668 GtkWidget * dialog = gtk_message_dialog_new(GTK_WINDOW(W.w),
661 GTK_DIALOG_DESTROY_WITH_PARENT,669 GTK_DIALOG_DESTROY_WITH_PARENT,
662 GTK_MESSAGE_INFO,670 GTK_MESSAGE_INFO,
663 GTK_BUTTONS_CLOSE, text);671 GTK_BUTTONS_CLOSE, "%s", text);
664 gtk_window_set_title(GTK_WINDOW(dialog), "Huomaa");672 gtk_window_set_title(GTK_WINDOW(dialog), "Huomaa");
665 gtk_dialog_run (GTK_DIALOG (dialog));673 gtk_dialog_run (GTK_DIALOG (dialog));
666 gtk_widget_destroy (dialog);674 gtk_widget_destroy (dialog);
781{789{
782 GtkWidget * e;790 GtkWidget * e;
783791
784 W.w = aWindow("TVKaista", gtk_main_quit, null,792 W.w = aWindow("TVKaista",
793 (gboolean(*)(void *,void *,void *))gtk_main_quit, null,
785 2, true, true,794 2, true, true,
786 aVBox(/* <- homogeneous spacing */ false, 2,795 aVBox(/* <- homogeneous spacing */ false, 2,
787 aHBox(/* <- homogeneous spacing */ false, 2,796 aHBox(/* <- homogeneous spacing */ false, 2,