Change FSF Address

[~andy/gtk] / tests / testactions.c

diff --git a/tests/testactions.c b/tests/testactions.c
index 01b6655171d98dae48e7d07ff08876119216da74..e59fa886013e00010d733d80afa10050022af1ea 100644 (file)
--- a/tests/testactions.c
+++ b/tests/testactions.c
@@ -12,13 +12,10 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#undef GTK_DISABLE_DEPRECATED
-#include <config.h>
+#include "config.h"
 #include <gtk/gtk.h>
 
 static GtkActionGroup *action_group = NULL;
@@ -95,13 +92,15 @@ show_accel_dialog (GtkAction *action)
 }
 
 static void
-toolbar_style (GtkAction *action, 
-              gpointer   user_data)
+toolbar_style (GtkAction *action)
 {
   GtkToolbarStyle style;
 
   g_return_if_fail (toolbar != NULL);
-  style = GPOINTER_TO_INT (user_data);
+
+  radio_action (action);
+
+  style = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (action));
 
   gtk_toolbar_set_style (toolbar, style);
 }
@@ -128,6 +127,8 @@ static GtkActionEntry entries[] = {
   { "Menu2Action", NULL, "Menu _2" },
   { "Menu3Action", NULL, "_Dynamic Menu" },
 
+  { "attach", "mail-attachment", "_Attachment...", "<Control>m",
+    "Attach a file", G_CALLBACK (activate_action) },
   { "cut", GTK_STOCK_CUT, "C_ut", "<control>X",
     "Cut the selected text to the clipboard", G_CALLBACK (activate_action) },
   { "copy", GTK_STOCK_COPY, "_Copy", "<control>C",
@@ -225,6 +226,7 @@ static const gchar *ui_info =
 "    <menu name=\"DynamicMenu\" action=\"Menu3Action\" />\n"
 "  </menubar>\n"
 "  <toolbar name=\"toolbar\">\n"
+"    <toolitem name=\"attach\" action=\"attach\" />\n"
 "    <toolitem name=\"cut\" action=\"cut\" />\n"
 "    <toolitem name=\"copy\" action=\"copy\" />\n"
 "    <toolitem name=\"paste\" action=\"paste\" />\n"
@@ -356,7 +358,7 @@ create_window (GtkActionGroup *action_group)
   g_signal_connect_swapped (window, "destroy", G_CALLBACK (g_object_unref), merge);
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
-  box = gtk_vbox_new (FALSE, 0);
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_add (GTK_CONTAINER (window), box);
   gtk_widget_show (box);
 
@@ -372,7 +374,7 @@ create_window (GtkActionGroup *action_group)
       g_error_free (error);
     }
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_box_pack_end (GTK_BOX (box), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
   
@@ -430,7 +432,7 @@ main (int argc, char **argv)
   gtk_action_group_add_radio_actions (action_group, 
                                      toolbar_entries, n_toolbar_entries, 
                                      GTK_TOOLBAR_BOTH,
-                                     G_CALLBACK (radio_action), NULL);
+                                     G_CALLBACK (toolbar_style), NULL);
   gtk_action_group_add_action_with_accel (action_group, action, NULL);
 
   create_window (action_group);