filechooserbutton: Don't show the (None) item when the combo box is popped up

[~andy/gtk] / gtk / gtkmountoperation.h

diff --git a/gtk/gtkmountoperation.h b/gtk/gtkmountoperation.h
index 7d93e65776988614f3ff6bccbdef0237a22c2700..cff736e188be3f70448c1d18327286bab82751db 100644 (file)
--- a/gtk/gtkmountoperation.h
+++ b/gtk/gtkmountoperation.h
@@ -12,9 +12,7 @@
  * 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/>.
  */
 
 /*
@@ -24,17 +22,12 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#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_MOUNT_OPERATION_H__
 #define __GTK_MOUNT_OPERATION_H__
 
-#include <glib.h>
-#include <gio/gio.h>
-#include <gdk/gdk.h>
-#include <gtk/gtkwindow.h>
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
 
 G_BEGIN_DECLS
 
@@ -45,18 +38,23 @@ G_BEGIN_DECLS
 #define GTK_IS_MOUNT_OPERATION_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GTK_TYPE_MOUNT_OPERATION))
 #define GTK_MOUNT_OPERATION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTK_TYPE_MOUNT_OPERATION, GtkMountOperationClass))
 
-typedef struct GtkMountOperation         GtkMountOperation;
-typedef struct GtkMountOperationClass    GtkMountOperationClass;
-typedef struct GtkMountOperationPrivate  GtkMountOperationPrivate;
+typedef struct _GtkMountOperation         GtkMountOperation;
+typedef struct _GtkMountOperationClass    GtkMountOperationClass;
+typedef struct _GtkMountOperationPrivate  GtkMountOperationPrivate;
 
-struct GtkMountOperation
+/**
+ * GtkMountOperation:
+ *
+ * This should not be accessed directly. Use the accessor functions below.
+ */
+struct _GtkMountOperation
 {
   GMountOperation parent_instance;
 
   GtkMountOperationPrivate *priv;
 };
 
-struct GtkMountOperationClass
+struct _GtkMountOperationClass
 {
   GMountOperationClass parent_class;
 
@@ -81,4 +79,3 @@ GdkScreen       *gtk_mount_operation_get_screen (GtkMountOperation *op);
 G_END_DECLS
 
 #endif /* __GTK_MOUNT_OPERATION_H__ */
-