[glade] Fixing up GTK+ plugin

[Tristan Van Berkom <tvb src gnome org>]

commit 7af971e552a37d3d80c014ee93ad53dfb2acf43c
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Sun Apr 14 15:34:07 2013 +0900

    Fixing up GTK+ plugin
    
     o Removed unused GladeTextButton class
    
     o Reordered Makefile.am in alphabetical order
    
     o Fixed some compiler warnings
    
     o Put .ui/.glade files at the end of lists in POTFILES.in

 plugins/gtk+/Makefile.am         | 126 ++++++++++++++---------------
 plugins/gtk+/glade-gtk.c         |   6 --
 plugins/gtk+/glade-text-button.c | 170 ---------------------------------------
 plugins/gtk+/glade-text-button.h |  59 --------------
 po/POTFILES.in                   |  15 ++--
 5 files changed, 68 insertions(+), 308 deletions(-)
---
diff --git a/plugins/gtk+/Makefile.am b/plugins/gtk+/Makefile.am
index 491d5d0..0389709 100644
--- a/plugins/gtk+/Makefile.am
+++ b/plugins/gtk+/Makefile.am
@@ -20,65 +20,60 @@ libgladegtk_la_CPPFLAGS =   \
 
 libgladegtk_la_CFLAGS = $(AM_CFLAGS)
 
-libgladegtk_la_SOURCES = \
-       $(BUILT_SOURCES) \
-       glade-gtk.c \
-       glade-fixed.c \
-       glade-accels.c \
-       glade-attributes.c \
-       glade-column-types.c \
-       glade-model-data.c \
-       glade-text-button.c \
-       glade-icon-sources.c \
-       glade-button-editor.c \
-       glade-tool-button-editor.c \
-       glade-image-editor.c \
-       glade-image-item-editor.c \
-       glade-icon-factory-editor.c \
-       glade-store-editor.c \
-       glade-label-editor.c \
-       glade-cell-renderer-editor.c \
-       glade-treeview-editor.c \
-       glade-entry-editor.c \
-       glade-activatable-editor.c \
-       glade-tool-item-group-editor.c \
-       glade-string-list.c \
-       glade-gtk-table.c \
-       glade-gtk-grid.c \
-       glade-gtk-box.c \
-       glade-gtk-action-widgets.c \
-       glade-gtk-info-bar.c \
-       glade-gtk-switch.c
+libgladegtk_la_SOURCES =               \
+       $(BUILT_SOURCES)                \
+       glade-accels.c                  \
+       glade-activatable-editor.c      \
+       glade-attributes.c              \
+       glade-button-editor.c           \
+       glade-cell-renderer-editor.c    \
+       glade-column-types.c            \
+       glade-entry-editor.c            \
+       glade-fixed.c                   \
+       glade-gtk.c                     \
+       glade-gtk-action-widgets.c      \
+       glade-gtk-box.c                 \
+       glade-gtk-grid.c                \
+       glade-gtk-info-bar.c            \
+       glade-gtk-switch.c              \
+       glade-gtk-table.c               \
+       glade-icon-factory-editor.c     \
+       glade-icon-sources.c            \
+       glade-image-editor.c            \
+       glade-image-item-editor.c       \
+       glade-label-editor.c            \
+       glade-model-data.c              \
+       glade-store-editor.c            \
+       glade-string-list.c             \
+       glade-tool-button-editor.c      \
+       glade-tool-item-group-editor.c  \
+       glade-treeview-editor.c
 
 libgladegtk_la_LDFLAGS     = -module -avoid-version $(AM_LDFLAGS)
 libgladegtk_la_LIBADD      = $(libgladeui) $(GTK_LIBS)
 
-noinst_HEADERS = \
-       glade-gtk.h \
-       glade-accels.h \
-       glade-attributes.h \
-       glade-column-types.h \
-       glade-model-data.h \
-       glade-text-button.h \
-       glade-icon-sources.h \
-       glade-button-editor.h \
-       glade-tool-button-editor.h \
-       glade-image-editor.h \
-       glade-image-item-editor.h \
-       glade-icon-factory-editor.h \
-       glade-store-editor.h \
-       glade-label-editor.h \
-       glade-cell-renderer-editor.h \
-       glade-treeview-editor.h \
-       glade-entry-editor.h \
-       glade-activatable-editor.h \
-       glade-fixed.h \
-       glade-tool-item-group-editor.h \
-       glade-string-list.h \
-       glade-gtk-marshallers.h \
-       glade-gtk-action-widgets.h \
-       glade-gtk-resources.h
-
+noinst_HEADERS =                       \
+       glade-accels.h                  \
+       glade-activatable-editor.h      \
+       glade-attributes.h              \
+       glade-button-editor.h           \
+       glade-cell-renderer-editor.h    \
+       glade-column-types.h            \
+       glade-entry-editor.h            \
+       glade-fixed.h                   \
+       glade-gtk.h                     \
+       glade-gtk-action-widgets.h      \
+       glade-icon-factory-editor.h     \
+       glade-icon-sources.h            \
+       glade-image-editor.h            \
+       glade-image-item-editor.h       \
+       glade-label-editor.h            \
+       glade-model-data.h              \
+       glade-store-editor.h            \
+       glade-string-list.h             \
+       glade-tool-button-editor.h      \
+       glade-tool-item-group-editor.h  \
+       glade-treeview-editor.h
 
 if PLATFORM_WIN32
 libgladegtk_la_LDFLAGS += -no-undefined
@@ -97,22 +92,23 @@ endif
 
 @INTLTOOL_XML_NOMERGE_RULE@
 
-BUILT_SOURCES = \
+BUILT_SOURCES =                \
        glade-gtk-marshallers.c \
        glade-gtk-marshallers.h \
-       glade-gtk-resources.c \
+       glade-gtk-resources.c   \
        glade-gtk-resources.h
 
-EXTRA_DIST = \
-       $(UI_FILES)     \
-       glade-gtk-marshallers.list \
-       gtk+.xml gtk+.xml.in \
-       gtkunixprint.xml gtkunixprint.xml.in \
-       glade-gtk-resources.gresource.xml
-
-UI_FILES = \
+UI_FILES =                             \
+       glade-activatable-editor.ui     \
        glade-button-editor.ui
 
+EXTRA_DIST =                                   \
+       $(UI_FILES)                             \
+       glade-gtk-marshallers.list              \
+       gtk+.xml gtk+.xml.in                    \
+       gtkunixprint.xml gtkunixprint.xml.in    \
+       glade-gtk-resources.gresource.xml
+
 CLEANFILES = gtk+.xml gtkunixprint.xml $(BUILT_SOURCES)
 
 #
diff --git a/plugins/gtk+/glade-gtk.c b/plugins/gtk+/glade-gtk.c
index 5e25c9b..7a450e8 100644
--- a/plugins/gtk+/glade-gtk.c
+++ b/plugins/gtk+/glade-gtk.c
@@ -4780,10 +4780,6 @@ void
 glade_gtk_menu_item_post_create (GladeWidgetAdaptor * adaptor,
                                  GObject * object, GladeCreateReason reason)
 {
-  GladeWidget *gitem;
-
-  gitem = glade_widget_get_from_gobject (object);
-
   if (GTK_IS_SEPARATOR_MENU_ITEM (object))
     return;
 
@@ -5914,8 +5910,6 @@ glade_gtk_tool_item_post_create (GladeWidgetAdaptor *adaptor,
                                  GObject            *object, 
                                 GladeCreateReason   reason)
 {
-  GladeWidget *gitem = glade_widget_get_from_gobject (object);
-
   if (GTK_IS_SEPARATOR_TOOL_ITEM (object))
     return;
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7702f0b..ec2fdae 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,14 +1,13 @@
 [encoding: UTF-8]
 # List of source files containing translatable strings.
 
-
 # Main application
 data/glade.desktop.in.in
 src/glade-close-button.c
-[type: gettext/glade]src/glade.glade
-[type: gettext/glade]src/glade-preferences.glade
 src/glade-window.c
 src/main.c
+[type: gettext/glade]src/glade.glade
+[type: gettext/glade]src/glade-preferences.glade
 
 # libgladeui shared core library
 gladeui/glade-app.c
@@ -22,7 +21,6 @@ gladeui/glade-debug.c
 gladeui/glade-design-layout.c
 gladeui/glade-design-view.c
 gladeui/glade-editor.c
-[type: gettext/glade]gladeui/glade-editor.ui
 gladeui/glade-editor-property.c
 gladeui/glade-editor-skeleton.c
 gladeui/glade-editor-table.c
@@ -35,12 +33,10 @@ gladeui/glade-popup.c
 gladeui/glade-preview.c
 gladeui/glade-previewer.c
 gladeui/glade-project.c
-[type: gettext/glade]gladeui/glade-project-properties.ui
 gladeui/glade-property.c
 gladeui/glade-property-class.c
 gladeui/glade-property-label.c
 gladeui/glade-property-shell.c
-[type: gettext/glade]gladeui/glade-property-label.ui
 gladeui/glade-signal.c
 gladeui/glade-signal-class.c
 gladeui/glade-signal-editor.c
@@ -50,14 +46,15 @@ gladeui/glade-widget-adaptor.c
 gladeui/glade-widget.c
 gladeui/glade-xml-utils.c
 gladeui/icon-naming-spec.c
+[type: gettext/glade]gladeui/glade-editor.ui
+[type: gettext/glade]gladeui/glade-project-properties.ui
+[type: gettext/glade]gladeui/glade-property-label.ui
 
 # gtk plugin backend
 plugins/gtk+/glade-accels.c
 plugins/gtk+/glade-activatable-editor.c
-[type: gettext/glade]plugins/gtk+/glade-activatable-editor.ui
 plugins/gtk+/glade-attributes.c
 plugins/gtk+/glade-button-editor.c
-[type: gettext/glade]plugins/gtk+/glade-button-editor.ui
 plugins/gtk+/glade-cell-renderer-editor.c
 plugins/gtk+/glade-column-types.c
 plugins/gtk+/glade-entry-editor.c
@@ -80,3 +77,5 @@ plugins/gtk+/glade-tool-item-group-editor.c
 plugins/gtk+/glade-treeview-editor.c
 plugins/gtk+/gtkunixprint.xml.in
 plugins/gtk+/gtk+.xml.in
+[type: gettext/glade]plugins/gtk+/glade-activatable-editor.ui
+[type: gettext/glade]plugins/gtk+/glade-button-editor.ui