X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkmodules.h;h=4aca3606ea94e1294d4f89badbe3c1b9b369b9cb;hb=f076b6bb0284b59de67d5be8d53a14b5bb32e119;hp=bd157f79a72ed9e10965055eaea459da2da5963f;hpb=3845ca6eea4ed8c74d302965342bfcd748b79b31;p=~andy%2Fgtk

diff --git a/gtk/gtkmodules.h b/gtk/gtkmodules.h
index bd157f79a..4aca3606e 100644
--- a/gtk/gtkmodules.h
+++ b/gtk/gtkmodules.h
@@ -13,35 +13,43 @@
  * 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/>.
  */
 
 #ifndef __GTK_MODULES_H__
 #define __GTK_MODULES_H__
 
-#include <gtk/gtksettings.h>
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
 
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 
+/**
+ * GtkModuleInitFunc:
+ * @argc: (allow-none): GTK+ always passes %NULL for this argument
+ * @argv: (allow-none) (array length=argc): GTK+ always passes %NULL for this argument
+ *
+ * Each GTK+ module must have a function gtk_module_init()
+ * with this prototype. This function is called after loading
+ * the module.
+ */
+typedef void     (*GtkModuleInitFunc)        (gint        *argc,
+                                              gchar      ***argv);
 
-/* Functions for use within GTK+
+/**
+ * GtkModuleDisplayInitFunc:
+ * @display: an open #GdkDisplay
+ *
+ * A multihead-aware GTK+ module may have a gtk_module_display_init()
+ * function with this prototype. GTK+ calls this function for each
+ * opened display.
+ *
+ * Since: 2.2
  */
-gchar * _gtk_find_module        (const gchar *name,
-			         const gchar *type);
-gchar **_gtk_get_module_path    (const gchar *type);
-
-void    _gtk_modules_init             (gint         *argc,
-				       gchar      ***argv,
-				       const gchar  *gtk_modules_args);
-void    _gtk_modules_settings_changed (GtkSettings  *settings, 
-				       const gchar  *modules);
-
-typedef void	 (*GtkModuleInitFunc)        (gint	  *argc,
-					      gchar      ***argv);
-typedef void	 (*GtkModuleDisplayInitFunc) (GdkDisplay   *display);
+typedef void     (*GtkModuleDisplayInitFunc) (GdkDisplay   *display);
 
 
 G_END_DECLS