diff options
| author | Hans Breuer <hans@breuer.org> | 2007-01-13 22:18:06 +0000 |
|---|---|---|
| committer | Hans Breuer <hans@src.gnome.org> | 2007-01-13 22:18:06 +0000 |
| commit | 17c60500bba636c642f0d53204daf79be9fd539b (patch) | |
| tree | 59048beb05f16cbbf3260320475194e0ed1dc2b5 /gtk/gtkprintoperation-win32.c | |
| parent | 3f403cde24615bd460e792d81c592ef71d2f01aa (diff) | |
| download | gtk+-17c60500bba636c642f0d53204daf79be9fd539b.tar.gz | |
take the custom tab label from gtk_print_operation_set_custom_tab_label()
2007-01-13 Hans Breuer <hans@breuer.org>
* gtk/gtkprintoperation-win32.c : take the custom tab label from
gtk_print_operation_set_custom_tab_label() into account (bug #390746).
svn path=/trunk/; revision=17139
Diffstat (limited to 'gtk/gtkprintoperation-win32.c')
| -rw-r--r-- | gtk/gtkprintoperation-win32.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gtk/gtkprintoperation-win32.c b/gtk/gtkprintoperation-win32.c index 7e815a3726..1c034bfbfc 100644 --- a/gtk/gtkprintoperation-win32.c +++ b/gtk/gtkprintoperation-win32.c @@ -1356,7 +1356,7 @@ create_application_page (GtkPrintOperation *op) WORD baseunitX, baseunitY; WORD *array; GtkRequisition requisition; - const char *app_name; + const char *tab_label; /* Make the template the size of the custom widget size request */ gtk_widget_size_request (op->priv->custom_widget, &requisition); @@ -1386,10 +1386,13 @@ create_application_page (GtkPrintOperation *op) page.dwFlags = PSP_DLGINDIRECT | PSP_USETITLE | PSP_PREMATURE; page.hInstance = GetModuleHandle (NULL); page.pResource = template; - app_name = g_get_application_name (); - if (app_name == NULL) - app_name = _("Application"); - page.pszTitle = g_utf8_to_utf16 (app_name, + + tab_label = op->priv->custom_tab_label; + if (tab_label == NULL) + tab_label = g_get_application_name (); + if (tab_label == NULL) + tab_label = _("Application"); + page.pszTitle = g_utf8_to_utf16 (tab_label, -1, NULL, NULL, NULL); page.pfnDlgProc = pageDlgProc; page.pfnCallback = NULL; |