Re: [gnome-network][PATCHES] Remote Desktop Server

[Mason Kidd <mrkidd mrkidd com>]

On Tue, 2004-01-06 at 02:50, Rodrigo Moya wrote:
> On Fri, 2004-01-02 at 08:11, Mason Kidd wrote:
> > 3. gds-clients-hig.patch: Fixes a segfault when
> > opening/closing/re-opening the 'Clients' dialog.  Also makes some HIG
> > changes to the dialog.
> > 
> this one does not apply cleanly after the other two, so could you please
> resend it?
> 
> cheers
Heh... I knew I should have made them all one patch.

Attached is a new patch for the Clients dialog.

Mason Kidd

? desktop/ChangeLog.new
? network-utilities/gnome-remote-shell.desktop
? network-utilities/help/Makefile
? network-utilities/help/Makefile.in
? network-utilities/help/C/Makefile
? network-utilities/help/C/Makefile.in
? network-utilities/help/C/gnome-remote-shell-C.omf.out
? network-utilities/help/C/omf_timestamp
Index: desktop/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-network/desktop/ChangeLog,v
retrieving revision 1.33
diff -u -r1.33 ChangeLog
--- desktop/ChangeLog	6 Jan 2004 20:21:45 -0000	1.33
+++ desktop/ChangeLog	7 Jan 2004 01:15:55 -0000
@@ -1,3 +1,8 @@
+2004-01-06  Mason Kidd <mrkidd mrkidd com>
+
+	* desktop/server/tray.c: Fix a segfault when opening/closing/
+	reopening the 'Clients' dialog.  HIG fixes to the 'Clients' dialog.
+
 2004-01-06  German Poo-Caaman~o <gpoo ubiobio cl>
 
 	* server/tray.c: Fixed compilation warnings
Index: desktop/server/tray.c
===================================================================
RCS file: /cvs/gnome/gnome-network/desktop/server/tray.c,v
retrieving revision 1.11
diff -u -r1.11 tray.c
--- desktop/server/tray.c	6 Jan 2004 20:21:45 -0000	1.11
+++ desktop/server/tray.c	7 Jan 2004 01:15:56 -0000
@@ -151,7 +151,7 @@
          GdkPixbuf *pixbuf = NULL;
          const gchar *authors[] = { "Rob Clews <robc klearsystems com>", NULL };
          const gchar *documenters[] = { NULL };
-		 const gchar copyright[1024];
+		 const gchar copyright[] = { "Copyright \xc2\xa9 2003 Rob Clews"};
  
          if (about != NULL) {
                  gtk_window_present (GTK_WINDOW (about));
@@ -161,7 +161,7 @@
          pixbuf = gdk_pixbuf_new_from_file ("gnome-session.png", NULL);
 
          about = gnome_about_new(_("Desktop Sharing"), VERSION,
-                         "Copyright \xc2\xa9 2003 Rob Clews",
+                         (const char *)copyright,
                          _("Remote Desktop Sharing"),
                          (const char **)authors,
                          (const char **)documenters,
@@ -396,10 +396,11 @@
 	gtk_window_set_title(GTK_WINDOW(window), "Connected Clients");
 	gtk_window_set_default_size(GTK_WINDOW(window),300,300);
 
-	gtk_container_set_border_width (GTK_CONTAINER (window), 8);
+	gtk_container_set_border_width (GTK_CONTAINER (window), 12);
 
-	vbox = gtk_vbox_new (FALSE, 8);
-	label = gtk_label_new ("Clients currently viewing your desktop");
+	vbox = gtk_vbox_new (FALSE, 12);
+	gtk_container_add (GTK_CONTAINER (window), vbox);
+	label = gtk_label_new (_("Clients currently viewing your desktop"));
 	gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
 	sw = gtk_scrolled_window_new (NULL, NULL);
@@ -414,25 +415,25 @@
 	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (tv), TRUE);
 	gtk_tree_view_set_search_column (GTK_TREE_VIEW (tv), COLUMN_HOSTNAME);
 	add_columns (GTK_TREE_VIEW (tv));
-	g_object_unref (store);
 	gtk_container_add (GTK_CONTAINER (sw), tv);
 
-	hbox = gtk_hbox_new(FALSE, 8);
+	hbox = gtk_hbutton_box_new ();
+	gtk_button_box_set_layout (GTK_BUTTON_BOX (hbox), GTK_BUTTONBOX_END);
+	gtk_box_set_spacing (GTK_BOX (hbox), 6);
+	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
-	button = gtk_button_new_with_label("Disconnect");
+	button = gtk_button_new_with_label (_("Disconnect"));
 	gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
 	g_signal_connect ((gpointer) button, "clicked",
 			  G_CALLBACK (disconnect_clients),
 			  NULL);
 
-	button = gtk_button_new_with_label("Close");
+	button = gtk_button_new_from_stock (GTK_STOCK_CLOSE);;
 	gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 	g_signal_connect ((gpointer) button, "clicked",
 			  G_CALLBACK (close_clients_dialog),
 			  window);
 
-	gtk_container_add (GTK_CONTAINER (window), vbox);
 	gtk_widget_show_all(window);
 }
 static void