cavehippo

Index: gtk/inventory.c
===================================================================
RCS file: /cvsroot/crossfire/client/gtk/inventory.c,v
retrieving revision 1.4
diff -C5 -r1.4 inventory.c
*** gtk/inventory.c     10 Sep 2005 14:19:00 -0000      1.4
--- gtk/inventory.c     16 Jan 2006 00:25:09 -0000
***************
*** 996,1014 ****
   * Now slap the labels on around the invwidgets.
   */

  itemlist look_list, inv_list;

  /* forward */
  static void close_container_callback(item *op);


  void get_look_display(GtkWidget *frame)
  {
    GtkWidget *vbox1;
    GtkWidget *hbox1;
-   GtkWidget *closebutton;

    look_list.env = cpl.below;
    strcpy (look_list.title, "You see:");
    strcpy (look_list.last_title, look_list.title);
    strcpy (look_list.last_weight, "0");
--- 996,1015 ----
   * Now slap the labels on around the invwidgets.
   */

  itemlist look_list, inv_list;

+ GtkWidget *closebutton;
+
  /* forward */
  static void close_container_callback(item *op);


  void get_look_display(GtkWidget *frame)
  {
    GtkWidget *vbox1;
    GtkWidget *hbox1;

    look_list.env = cpl.below;
    strcpy (look_list.title, "You see:");
    strcpy (look_list.last_title, look_list.title);
    strcpy (look_list.last_weight, "0");
***************
*** 1026,1035 ****
--- 1027,1037 ----

    closebutton = gtk_button_new_with_label ("Close");
    gtk_signal_connect_object (GTK_OBJECT (closebutton), "clicked",
                               GTK_SIGNAL_FUNC(close_container_callback),
                               NULL);
+   gtk_widget_set_sensitive(closebutton, False);
    gtk_box_pack_start (GTK_BOX(hbox1),closebutton, FALSE, FALSE, 2);
    gtk_widget_show (closebutton);
    gtk_tooltips_set_tip (tooltips, closebutton,
        "This will close an item if you have one open.",
        NULL);
***************
*** 1330,1353 ****

      g_list_foreach(inv_viewers, set_look_list_env_one, op);
  }


! void open_container (item *op)
! {
    set_look_list_env(op);
    sprintf (look_list.title, "%s:", op->d_name);
    update_list_labels (&look_list);
  }

  void close_container(item *op)
  {
    if (look_list.env != cpl.below) {
      if (use_config[CONFIG_APPLY_CONTAINER])
        client_send_apply (look_list.env->tag);
      set_look_list_env(cpl.below);
      strcpy (look_list.title, "You see:");
      update_list_labels (&look_list);
    }
  }

  /* This is basically the same as above, but is used for the callback
--- 1332,1357 ----

      g_list_foreach(inv_viewers, set_look_list_env_one, op);
  }


! void open_container (item *op) {
    set_look_list_env(op);
    sprintf (look_list.title, "%s:", op->d_name);
+   gtk_widget_set_sensitive(closebutton, True);
+
    update_list_labels (&look_list);
  }

  void close_container(item *op)
  {
    if (look_list.env != cpl.below) {
      if (use_config[CONFIG_APPLY_CONTAINER])
        client_send_apply (look_list.env->tag);
      set_look_list_env(cpl.below);
      strcpy (look_list.title, "You see:");
+     gtk_widget_set_sensitive(closebutton, False);
      update_list_labels (&look_list);
    }
  }

  /* This is basically the same as above, but is used for the callback
***************
*** 1359,1368 ****
--- 1363,1374 ----
  {
    if (look_list.env != cpl.below) {
      client_send_apply (look_list.env->tag);
      set_look_list_env(cpl.below);
      strcpy (look_list.title, "You see:");
+     gtk_widget_set_sensitive(closebutton, False);
+
      update_list_labels (&look_list);
    }
  }

  /* --- */