~ubuntu-branches/ubuntu/vivid/gnote/vivid-proposed

« back to all changes in this revision

Viewing changes to src/noteaddin.cpp

  • Committer: Package Import Robot
  • Author(s): Vincent Cheng
  • Date: 2014-10-04 23:29:38 UTC
  • mfrom: (1.3.22)
  • Revision ID: package-import@ubuntu.com-20141004232938-ctmgoabfgfoz27ft
Tags: 3.14.0-1
* New upstream release.
* Update Standards version to 3.9.6, no changes required.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
/*
2
2
 * gnote
3
3
 *
4
 
 * Copyright (C) 2012-2013 Aurimas Cernius
 
4
 * Copyright (C) 2012-2014 Aurimas Cernius
5
5
 * Copyright (C) 2009 Hubert Figuiere
6
6
 *
7
7
 * This program is free software: you can redistribute it and/or modify
86
86
      if ((iter->first->get_parent() == NULL) ||
87
87
          (iter->first->get_parent() != window->embeddable_toolbar())) {
88
88
        Gtk::Grid *grid = window->embeddable_toolbar();
89
 
        int col = grid->get_children().size();
90
 
        grid->attach(*(iter->first), col, 0, 1, 1);
 
89
        grid->insert_column(iter->second);
 
90
        grid->attach(*iter->first, iter->second, 0, 1, 1);
91
91
      }
92
92
    }
93
93
  }
111
111
      
112
112
    if (m_note->is_opened()) {
113
113
      Gtk::Grid *grid = get_window()->embeddable_toolbar();
114
 
      grid->attach(*item, grid->get_children().size(), 0, 1, 1);
 
114
      grid->insert_column(position);
 
115
      grid->attach(*item, position, 0, 1, 1);
115
116
    }
116
117
  }
117
118