[Pkg-wmaker-commits] [wmstickynotes] 08/81: Pass integers instead of strings of color names when new note buttons are clicked.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmstickynotes.

commit 3cdbdac7640dacf3ce48b922f89706ef0549f230
Author: hnc <hnc at 7fc852e4-12a7-4f5b-bad7-374d67da4d19>
Date:   Sat Feb 14 20:54:21 2009 +0000

    Pass integers instead of strings of color names when new note buttons are clicked.
    
    git-svn-id: svn://svn.code.sf.net/p/wmstickynotes/code@4 7fc852e4-12a7-4f5b-bad7-374d67da4d19
---
 wmstickynotes.c | 24 +++++++++---------------
 wmstickynotes.h |  2 +-
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/wmstickynotes.c b/wmstickynotes.c
index ca52e05..4c90efa 100644
--- a/wmstickynotes.c
+++ b/wmstickynotes.c
@@ -195,16 +195,10 @@ void create_note(Note *old_note, int color)
 	g_signal_connect(G_OBJECT(top_bar_box), "button-press-event", G_CALLBACK(bar_pressed), note);
 }
 
-void new_note_button_clicked(GtkButton *button, char *color)
+void new_note_button_clicked(GtkButton *button, gpointer color)
 {
-	int c;
-
-	for(c=0; c<=5; c++) {
-		if(!strcmp(color_schemes[c].name, color)) break;
-	}
-	if(strcmp(color_schemes[c].name, color)) c = 0;
-
-	create_note(NULL, c);
+	if((int)color > 5) color = 0;
+	create_note(NULL, (int)color);
 }
 
 void read_old_notes()
@@ -334,12 +328,12 @@ int main(int argc, char *argv[])
 	XSetWMHints(GDK_DISPLAY(), GDK_WINDOW_XWINDOW(window->window), &mywmhints);
 
 	g_signal_connect(G_OBJECT(window), "destroy", G_CALLBACK(gtk_main_quit), NULL);
-	g_signal_connect(G_OBJECT(yellow_button), "clicked", G_CALLBACK(new_note_button_clicked), "yellow");
-	g_signal_connect(G_OBJECT(green_button), "clicked", G_CALLBACK(new_note_button_clicked), "green");
-	g_signal_connect(G_OBJECT(orange_button), "clicked", G_CALLBACK(new_note_button_clicked), "orange");
-	g_signal_connect(G_OBJECT(red_button), "clicked", G_CALLBACK(new_note_button_clicked), "red");
-	g_signal_connect(G_OBJECT(blue_button), "clicked", G_CALLBACK(new_note_button_clicked), "blue");
-	g_signal_connect(G_OBJECT(white_button), "clicked", G_CALLBACK(new_note_button_clicked), "white");
+	g_signal_connect(G_OBJECT(yellow_button), "clicked", G_CALLBACK(new_note_button_clicked), (gpointer)0);
+	g_signal_connect(G_OBJECT(green_button), "clicked", G_CALLBACK(new_note_button_clicked), (gpointer)1);
+	g_signal_connect(G_OBJECT(orange_button), "clicked", G_CALLBACK(new_note_button_clicked), (gpointer)2);
+	g_signal_connect(G_OBJECT(red_button), "clicked", G_CALLBACK(new_note_button_clicked), (gpointer)3);
+	g_signal_connect(G_OBJECT(blue_button), "clicked", G_CALLBACK(new_note_button_clicked), (gpointer)4);
+	g_signal_connect(G_OBJECT(white_button), "clicked", G_CALLBACK(new_note_button_clicked), (gpointer)5);
 
 	umask(077);
 
diff --git a/wmstickynotes.h b/wmstickynotes.h
index 197f80c..3e7f6cc 100644
--- a/wmstickynotes.h
+++ b/wmstickynotes.h
@@ -41,7 +41,7 @@ void bar_pressed(GtkWidget *widget, GdkEventButton *event, Note *note);
 void resize_button_pressed(GtkWidget *widget, GdkEventButton *event, Note *note);
 void delete_button_pressed(GtkWidget *widget, GdkEventButton *event, GtkWidget *window);
 void create_note(Note *old_note, int color);
-void new_note_button_clicked(GtkButton *button, char *color);
+void new_note_button_clicked(GtkButton *button, gpointer color);
 void read_old_notes();
 
 #endif /* WMSTICKYNOTES_H */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmstickynotes.git