X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkprintbackend.c;h=fc1f335ac083b1973b27d1ca785e37c252551242;hb=9d0febc9a64a5bfb0fcfc3a88de4757f6c1ff090;hp=f12f237b286bdf2d4b62121b02077d3df519b386;hpb=7f2cc85db96afb9806fc62ce6e32c47e49a9f4d3;p=~andy%2Fgtk

diff --git a/gtk/gtkprintbackend.c b/gtk/gtkprintbackend.c
index f12f237b2..fc1f335ac 100644
--- a/gtk/gtkprintbackend.c
+++ b/gtk/gtkprintbackend.c
@@ -13,9 +13,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/>.
  */
 
 #include "config.h"
@@ -25,12 +23,11 @@
 
 #include "gtkintl.h"
 #include "gtkmodules.h"
+#include "gtkmodulesprivate.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtkprintbackend.h"
 
-#define GTK_PRINT_BACKEND_GET_PRIVATE(o)  \
-   (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_PRINT_BACKEND, GtkPrintBackendPrivate))
 
 static void gtk_print_backend_dispose      (GObject      *object);
 static void gtk_print_backend_set_property (GObject      *object,
@@ -197,9 +194,7 @@ gtk_print_backend_set_property (GObject      *object,
                                 GParamSpec   *pspec)
 {
   GtkPrintBackend *backend = GTK_PRINT_BACKEND (object);
-  GtkPrintBackendPrivate *priv;
-
-  priv = backend->priv = GTK_PRINT_BACKEND_GET_PRIVATE (backend); 
+  GtkPrintBackendPrivate *priv = backend->priv;
 
   switch (prop_id)
     {
@@ -219,9 +214,7 @@ gtk_print_backend_get_property (GObject    *object,
                                 GParamSpec *pspec)
 {
   GtkPrintBackend *backend = GTK_PRINT_BACKEND (object);
-  GtkPrintBackendPrivate *priv;
-
-  priv = backend->priv = GTK_PRINT_BACKEND_GET_PRIVATE (backend); 
+  GtkPrintBackendPrivate *priv = backend->priv;
 
   switch (prop_id)
     {
@@ -303,7 +296,7 @@ _gtk_print_backend_create (const gchar *backend_name)
 }
 
 /**
- * gtk_printer_backend_load_modules:
+ * gtk_print_backend_load_modules:
  *
  * Return value: (element-type GtkPrintBackend) (transfer container):
  */
@@ -454,7 +447,9 @@ gtk_print_backend_init (GtkPrintBackend *backend)
 {
   GtkPrintBackendPrivate *priv;
 
-  priv = backend->priv = GTK_PRINT_BACKEND_GET_PRIVATE (backend); 
+  priv = backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (backend,
+                                                      GTK_TYPE_PRINT_BACKEND,
+                                                      GtkPrintBackendPrivate);
 
   priv->printers = g_hash_table_new_full (g_str_hash, g_str_equal, 
 					  (GDestroyNotify) g_free,
@@ -593,7 +588,11 @@ gtk_print_backend_set_list_done (GtkPrintBackend *backend)
 /**
  * gtk_print_backend_get_printer_list:
  *
+ * Returns the current list of printers.
+ *
  * Return value: (element-type GtkPrinter) (transfer container):
+ *   A list of #GtkPrinter objects. The list should be freed
+ *   with g_list_free().
  */
 GList *
 gtk_print_backend_get_printer_list (GtkPrintBackend *backend)
@@ -752,18 +751,17 @@ request_password (GtkPrintBackend  *backend,
                                          NULL);
 
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
-  gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 
-  main_box = gtk_hbox_new (FALSE, 0);
+  main_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 
   /* Left */
   icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION, GTK_ICON_SIZE_DIALOG);
-  gtk_misc_set_alignment (GTK_MISC (icon), 0.5, 0.0);
-  gtk_misc_set_padding (GTK_MISC (icon), 6, 6);
-
+  gtk_widget_set_halign (icon, GTK_ALIGN_CENTER);
+  gtk_widget_set_valign (icon, GTK_ALIGN_START);
+  g_object_set (icon, "margin", 6, NULL);
 
   /* Right */
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_widget_set_size_request (GTK_WIDGET (vbox), 320, -1);
 
   /* Right - 1. */
@@ -790,10 +788,12 @@ request_password (GtkPrintBackend  *backend,
       priv->auth_info[i] = g_strdup (ai_default[i]);
       if (ai_display[i] != NULL)
         {
-          box = gtk_hbox_new (TRUE, 0);
+          box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+          gtk_box_set_homogeneous (GTK_BOX (box), TRUE);
 
           label = gtk_label_new (ai_display[i]);
-          gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+          gtk_widget_set_halign (label, GTK_ALIGN_START);
+          gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
 
           entry = gtk_entry_new ();
           focus = entry;