Re: GNOME CVS: gnome-applets loban

[Mikael Hallendal <micke codefactory se>]

tor 2003-03-20 klockan 02.17 skrev Gnome CVS User:
> CVSROOT:	/cvs/gnome
> Module name:	gnome-applets
> Changes by:	loban	03/03/19 20:17:54
> 
> Modified files:
> 	stickynotes    : ChangeLog stickynotes_applet.c 
> 	                 stickynotes_applet.h 
> 	                 stickynotes_applet_callbacks.c 
> 
> Log message:
> Fully fixed bug #107943 [http://bugzilla.gnome.org/show_bug.cgi?id=107943], including double dialogs.
> 
> URL : http://cvs.gnome.org/bonsai/cvsquery.cgi?branch=&dir=gnome-applets&who=loban&date=explicit&mindate=2003-03-19%2020:16&maxdate=2003-03-19%2020:18&cvsroot=/cvs/gnome

Please try to compile the code before commiting. This breaks building
gnome-applets.

This patch fixes the problems (and one introduced in an earlier commit).

I've commited since it breaks building HEAD. 

Regards,
  Mikael Hallendal

-- 
Mikael Hallendal                micke codefactory se
CodeFactory AB                  http://www.codefactory.se/
                                Cell: +46 (0)709 718 918

? autom4te.cache
? battstat/docs/ja/Makefile
? battstat/docs/ja/Makefile.in
? cdplayer/inlinepixbufs.h
? drivemount/help/Makefile
? drivemount/help/Makefile.in
? drivemount/help/C/Makefile
? drivemount/help/C/Makefile.in
? drivemount/help/C/omf_timestamp
? mailcheck/help/Makefile
? mailcheck/help/Makefile.in
? mini-commander/src/mc-install-default-macros
? omf-install/battstat-ja.omf
? omf-install/cdplayer-ja.omf
? omf-install/char-palette-ja.omf
? omf-install/drivemount-C.omf
? omf-install/mailcheck-C.omf
? omf-install/mailcheck-ja.omf
? omf-install/stickynotes_applet-C.omf
? panel-menu/Makefile
? panel-menu/Makefile.in
? panel-menu/help/Makefile
? panel-menu/help/Makefile.in
? panel-menu/help/C/Makefile
? panel-menu/help/C/Makefile.in
Index: stickynotes/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-applets/stickynotes/ChangeLog,v
retrieving revision 1.22
diff -u -r1.22 ChangeLog
--- stickynotes/ChangeLog	20 Mar 2003 01:17:54 -0000	1.22
+++ stickynotes/ChangeLog	21 Mar 2003 00:40:23 -0000
@@ -1,3 +1,13 @@
+2003-03-21  Mikael Hallendal  <micke codefactory se>
+
+	* stickynotes_applet_callbacks.c:
+	- Use NULL instead of 0 for pointers.
+	(menu_preferences_cb): build fixes.
+	(menu_about_cb): build fixes
+
+	* stickynotes_applet.c (stickynotes_applet_fill): 
+	- Use NULL instead of 0 for pointers.
+
 2003-03-19  Loban A Rahman <loban earthling net>
 
     * stickynotes_applet_callbacks.h, stickynotes_applet_callbacks.c:
Index: stickynotes/stickynotes_applet.c
===================================================================
RCS file: /cvs/gnome/gnome-applets/stickynotes/stickynotes_applet.c,v
retrieving revision 1.7
diff -u -r1.7 stickynotes_applet.c
--- stickynotes/stickynotes_applet.c	20 Mar 2003 01:17:54 -0000	1.7
+++ stickynotes/stickynotes_applet.c	21 Mar 2003 00:40:23 -0000
@@ -46,8 +46,8 @@
 	/* Create and initialize Sticky Note Applet Settings Instance */
 	stickynotes = g_new(StickyNotesApplet, 1);
 	stickynotes->applet = GTK_WIDGET(applet);
-	stickynotes->about = 0;
-	stickynotes->preferences = 0;
+	stickynotes->about = NULL;
+	stickynotes->preferences = NULL;
 	stickynotes->size = panel_applet_get_size(applet);
 	stickynotes->pressed = FALSE;
 	stickynotes->notes = NULL;
Index: stickynotes/stickynotes_applet_callbacks.c
===================================================================
RCS file: /cvs/gnome/gnome-applets/stickynotes/stickynotes_applet_callbacks.c,v
retrieving revision 1.8
diff -u -r1.8 stickynotes_applet_callbacks.c
--- stickynotes/stickynotes_applet_callbacks.c	20 Mar 2003 01:17:54 -0000	1.8
+++ stickynotes/stickynotes_applet_callbacks.c	21 Mar 2003 00:40:24 -0000
@@ -166,8 +166,8 @@
 {
 	GladeXML *glade;
 	
-	if (stickynotes->preferences != 0) {
-		gtk_widget_raise(stickynotes->preferences);
+	if (stickynotes->preferences != NULL) {
+		gdk_window_raise(stickynotes->preferences->window);
 		return;
 	}
 	
@@ -218,8 +218,8 @@
 		gnome_color_picker_set_i16(GNOME_COLOR_PICKER(note_color), color.red, color.green, color.blue, 65535);
 	}
 	
-	gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(stickynotes->applet));
-	gtk_widget_show(dialog);
+	gtk_window_set_transient_for(GTK_WINDOW(stickynotes->preferences), GTK_WINDOW(stickynotes->applet));
+	gtk_widget_show(stickynotes->preferences);
 
 	g_object_unref(glade);
 }
@@ -235,8 +235,8 @@
 {
 	GladeXML *glade;
 	
-	if (stickynotes->about != 0) {
-		gtk_widget_raise(stickynotes->about);
+	if (stickynotes->about != NULL) {
+		gdk_window_raise(stickynotes->about->window);
 		return;
 	}
 	
@@ -265,7 +265,7 @@
 void about_response_cb(GtkDialog *dialog, gint response, GladeXML *glade)
 {
 	gtk_widget_destroy(GTK_WIDGET(dialog));
-	stickynotes->about = 0;
+	stickynotes->about = NULL;
 }
 
 /* Preferences Callback : Save. */
@@ -323,7 +323,7 @@
 	
 	else /* if (response == GTK_RESPONSE_CLOSE || response == GTK_RESPONSE_NONE) */ {
 		gtk_widget_destroy(GTK_WIDGET(dialog));
-		stickynotes->preferences = 0;
+		stickynotes->preferences = NULL;
 	}
 }