[Emacs-diffs] /srv/bzr/emacs/trunk r111325: * xterm.h (struct x_output): Remove toolbar_detached member since it's

[Dmitry Antipov]

------------------------------------------------------------
revno: 111325
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Tue 2012-12-25 19:07:59 +0400
message:
  * xterm.h (struct x_output): Remove toolbar_detached member since it's
  set but never used.
  * gtkutil.c (xg_tool_bar_detach_callback, xg_tool_bar_attach_callback)
  (xg_create_tool_bar): Adjust users.
modified:
  src/ChangeLog
  src/gtkutil.c
  src/xterm.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-12-25 11:37:21 +0000
+++ b/src/ChangeLog     2012-12-25 15:07:59 +0000
@@ -2,6 +2,10 @@
 
        * xdisp.c (redisplay_window): Remove inner local variable
        because the outer shadowed one has the same meaning.
+       * xterm.h (struct x_output): Remove toolbar_detached member since it's
+       set but never used.
+       * gtkutil.c (xg_tool_bar_detach_callback, xg_tool_bar_attach_callback)
+       (xg_create_tool_bar): Adjust users.
 
 2012-12-24  Dmitry Antipov  <address@hidden>
 

=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c     2012-12-12 15:33:30 +0000
+++ b/src/gtkutil.c     2012-12-25 15:07:59 +0000
@@ -4138,7 +4138,7 @@
   if (f)
     {
       GtkRequisition req, req2;
-      FRAME_X_OUTPUT (f)->toolbar_detached = 1;
+
       gtk_widget_get_preferred_size (GTK_WIDGET (wbox), NULL, &req);
       gtk_widget_get_preferred_size (w, NULL, &req2);
       req.width -= req2.width;
@@ -4173,7 +4173,7 @@
   if (f)
     {
       GtkRequisition req, req2;
-      FRAME_X_OUTPUT (f)->toolbar_detached = 0;
+
       gtk_widget_get_preferred_size (GTK_WIDGET (wbox), NULL, &req);
       gtk_widget_get_preferred_size (w, NULL, &req2);
       req.width += req2.width;
@@ -4347,7 +4347,6 @@
     }
 
   x->toolbar_widget = gtk_toolbar_new ();
-  x->toolbar_detached = 0;
 
   gtk_widget_set_name (x->toolbar_widget, "emacs-toolbar");
 

=== modified file 'src/xterm.h'
--- a/src/xterm.h       2012-11-23 15:39:48 +0000
+++ b/src/xterm.h       2012-12-25 15:07:59 +0000
@@ -475,8 +475,6 @@
   GtkWidget *toolbar_widget;
   /* The handle box that makes the tool bar detachable.  */
   GtkWidget *handlebox_widget;
-  /* Non-zero if the tool bar is detached.  */
-  int toolbar_detached;
   /* Non-zero if tool bar is packed into the hbox widget (i.e. vertical).  */
   int toolbar_in_hbox;