X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=tests%2Fteststatusicon.c;h=c6f81fc580205f99221b60aa8771a24b52d998e5;hb=HEAD;hp=4829bf0d0a2409b5695d98e14d4561c12297aada;hpb=7698daf97aced5c22aeeb7bfbf02567b61cebaef;p=~andy%2Fgtk

diff --git a/tests/teststatusicon.c b/tests/teststatusicon.c
index 4829bf0d0..c6f81fc58 100755
--- a/tests/teststatusicon.c
+++ b/tests/teststatusicon.c
@@ -13,9 +13,7 @@
  * 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/>.
  *
  * Authors:
  *	Mark McLoughlin <mark@skynet.ie>
@@ -75,12 +73,12 @@ update_icons (void)
 
   if (status == TEST_STATUS_INFO)
     {
-      icon_name = GTK_STOCK_DIALOG_INFO;
+      icon_name = "dialog-information";
       tooltip = "Some Information ...";
     }
   else
     {
-      icon_name = GTK_STOCK_DIALOG_QUESTION;
+      icon_name = "dialog-question";
       tooltip = "Some Question ...";
     }
 
@@ -106,16 +104,6 @@ timeout_handler (gpointer data)
   return TRUE;
 }
 
-static void
-blink_toggle_toggled (GtkToggleButton *toggle)
-{
-  GSList *l;
-
-  for (l = icons; l; l = l->next)
-    gtk_status_icon_set_blinking (GTK_STATUS_ICON (l->data), 
-                                  gtk_toggle_button_get_active (toggle));
-}
-
 static void
 visible_toggle_toggled (GtkToggleButton *toggle)
 {
@@ -143,6 +131,7 @@ timeout_toggle_toggled (GtkToggleButton *toggle)
 static void
 icon_activated (GtkStatusIcon *icon)
 {
+  GtkWidget *content_area;
   GtkWidget *dialog;
   GtkWidget *toggle;
 
@@ -165,8 +154,10 @@ icon_activated (GtkStatusIcon *icon)
       g_signal_connect (dialog, "delete_event", 
 			G_CALLBACK (gtk_widget_hide_on_delete), NULL);
 
+      content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+
       toggle = gtk_toggle_button_new_with_mnemonic ("_Show the icon");
-      gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->vbox), toggle, TRUE, TRUE, 6);
+      gtk_box_pack_end (GTK_BOX (content_area), toggle, TRUE, TRUE, 6);
       gtk_widget_show (toggle);
 
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
@@ -174,17 +165,8 @@ icon_activated (GtkStatusIcon *icon)
       g_signal_connect (toggle, "toggled", 
 			G_CALLBACK (visible_toggle_toggled), NULL);
 
-      toggle = gtk_toggle_button_new_with_mnemonic ("_Blink the icon");
-      gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->vbox), toggle, TRUE, TRUE, 6);
-      gtk_widget_show (toggle);
-
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
-				    gtk_status_icon_get_blinking (icon));
-      g_signal_connect (toggle, "toggled", 
-			G_CALLBACK (blink_toggle_toggled), NULL);
-
       toggle = gtk_toggle_button_new_with_mnemonic ("_Change images");
-      gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->vbox), toggle, TRUE, TRUE, 6);
+      gtk_box_pack_end (GTK_BOX (content_area), toggle, TRUE, TRUE, 6);
       gtk_widget_show (toggle);
 
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
@@ -196,35 +178,6 @@ icon_activated (GtkStatusIcon *icon)
   gtk_window_present (GTK_WINDOW (dialog));
 }
 
-static void
-check_activated (GtkCheckMenuItem *item)
-{
-  GSList *l;
-  GdkScreen *screen;
-
-  screen = NULL;
-
-  for (l = icons; l; l = l->next)
-    {
-      GtkStatusIcon *icon = l->data;
-      GdkScreen *orig_screen;
-
-      orig_screen = gtk_status_icon_get_screen (icon);
-
-      if (screen != NULL)
-        gtk_status_icon_set_screen (icon, screen);
-
-      screen = orig_screen;
-
-      gtk_status_icon_set_blinking (icon,
-                                    gtk_check_menu_item_get_active (item));
-    }
-
-  g_assert (screen != NULL);
-
-  gtk_status_icon_set_screen (GTK_STATUS_ICON (icons->data), screen);
-}
-
 static void
 do_properties (GtkMenuItem   *item,
 	       GtkStatusIcon *icon)
@@ -276,15 +229,6 @@ popup_menu (GtkStatusIcon *icon,
   gtk_menu_set_screen (GTK_MENU (menu),
                        gtk_status_icon_get_screen (icon));
 
-  menuitem = gtk_check_menu_item_new_with_label ("Blink");
-  gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), 
-				  gtk_status_icon_get_blinking (icon));
-  g_signal_connect (menuitem, "activate", G_CALLBACK (check_activated), NULL);
-
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-
-  gtk_widget_show (menuitem);
-
   menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_PROPERTIES, NULL);
   g_signal_connect (menuitem, "activate", G_CALLBACK (do_properties), icon);
 
@@ -337,7 +281,6 @@ main (int argc, char **argv)
       g_signal_connect (icon, "notify::orientation", G_CALLBACK (orientation_changed_cb), NULL);
       g_signal_connect (icon, "notify::screen", G_CALLBACK (screen_changed_cb), NULL);
       g_print ("icon size %d\n", gtk_status_icon_get_size (icon));
-      gtk_status_icon_set_blinking (GTK_STATUS_ICON (icon), FALSE);
 
       g_signal_connect (icon, "activate",
                         G_CALLBACK (icon_activated), NULL);