X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=cut-n-paste%2Ftoolbar-editor%2Fegg-toolbars-model.h;h=5d9841f83af3ba914acd832ec3e6af82d38c0175;hb=2dd348d6fe62d96589c81379bbd01314d6442dc0;hp=6961ee4ec0f4bd457147ea767a4cd0d56680e911;hpb=184fd329e9a52df566130c7526f8612eb0a399ee;p=evince.git

diff --git a/cut-n-paste/toolbar-editor/egg-toolbars-model.h b/cut-n-paste/toolbar-editor/egg-toolbars-model.h
index 6961ee4e..5d9841f8 100644
--- a/cut-n-paste/toolbar-editor/egg-toolbars-model.h
+++ b/cut-n-paste/toolbar-editor/egg-toolbars-model.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * 
  *  $Id$
  */
@@ -23,7 +23,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gdk/gdktypes.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 
@@ -98,19 +98,19 @@ typedef struct EggToolbarsItemType EggToolbarsItemType;
 struct EggToolbarsItemType
 {
   GdkAtom type;
-        
+
   gboolean (* has_data) (EggToolbarsItemType *type,
                          const char          *name);
   char *   (* get_data) (EggToolbarsItemType *type,
                          const char          *name);
-  
+
   char *   (* new_name) (EggToolbarsItemType *type,
                          const char          *data);
   char *   (* get_name) (EggToolbarsItemType *type,
                          const char          *data);
 };
 
-GType		  egg_toolbars_model_flags_get_type (void);
+GType		  egg_tb_model_flags_get_type       (void);
 GType		  egg_toolbars_model_get_type       (void);
 EggToolbarsModel *egg_toolbars_model_new	    (void);
 gboolean          egg_toolbars_model_load_names     (EggToolbarsModel *model,