X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkimcontext.h;h=55fe53f8710171adc2a8131531412fc3134a81e6;hb=0ba92bc26d1b716f2f9c0543593f13cd5a92c521;hp=a0f26471a5b4c85d2561f835f6f8d7a2e501c2ae;hpb=0bf3652e1df37321d4c2318f5bbf67438010f987;p=~andy%2Fgtk

diff --git a/gtk/gtkimcontext.h b/gtk/gtkimcontext.h
index a0f26471a..55fe53f87 100644
--- a/gtk/gtkimcontext.h
+++ b/gtk/gtkimcontext.h
@@ -12,21 +12,18 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_IM_CONTEXT_H__
 #define __GTK_IM_CONTEXT_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gdk/gdk.h>
-#include <gtk/gtkobject.h>
 
 
 G_BEGIN_DECLS
@@ -50,10 +47,7 @@ struct _GtkIMContext
 struct _GtkIMContextClass
 {
   /*< private >*/
-  /* Yes, this should be GObjectClass, be we can't fix it without breaking
-   * binary compatibility - see bug #90935
-   */
-  GtkObjectClass parent_class;
+  GObjectClass parent_class;
 
   /*< public >*/
   /* Signals */