Make print backends use standard icon names for printers
This is to make the print dialog work with the previous commit. See bug 626474.
This commit is contained in:
		| @ -1326,7 +1326,7 @@ cups_request_printer_info_cb (GtkPrintBackendCups *backend, | ||||
|   response = gtk_cups_result_get_response (result); | ||||
|  | ||||
|   /* TODO: determine printer type and use correct icon */ | ||||
|   gtk_printer_set_icon_name (printer, "gtk-print"); | ||||
|   gtk_printer_set_icon_name (printer, "printer"); | ||||
|   | ||||
|   state_msg = ""; | ||||
|   loc = ""; | ||||
| @ -2047,13 +2047,13 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, | ||||
|       /* Set printer icon according to importance | ||||
|          (none, report, warning, error - report is omitted). */ | ||||
|       if (printer_state_reason_level == 3) | ||||
|         gtk_printer_set_icon_name (printer, "gtk-print-error"); | ||||
|         gtk_printer_set_icon_name (printer, "printer-error"); | ||||
|       else if (printer_state_reason_level == 2) | ||||
|         gtk_printer_set_icon_name (printer, "gtk-print-warning"); | ||||
|         gtk_printer_set_icon_name (printer, "printer-warning"); | ||||
|       else if (gtk_printer_is_paused (printer)) | ||||
|         gtk_printer_set_icon_name (printer, "gtk-print-paused"); | ||||
|         gtk_printer_set_icon_name (printer, "printer-paused"); | ||||
|       else | ||||
|         gtk_printer_set_icon_name (printer, "gtk-print"); | ||||
|         gtk_printer_set_icon_name (printer, "printer"); | ||||
|  | ||||
|       if (status_changed) | ||||
|         g_signal_emit_by_name (GTK_PRINT_BACKEND (backend), | ||||
|  | ||||
| @ -496,7 +496,7 @@ gtk_print_backend_file_init (GtkPrintBackendFile *backend) | ||||
| 			  NULL);  | ||||
|  | ||||
|   gtk_printer_set_has_details (printer, TRUE); | ||||
|   gtk_printer_set_icon_name (printer, "gtk-save"); | ||||
|   gtk_printer_set_icon_name (printer, "document-save"); | ||||
|   gtk_printer_set_is_active (printer, TRUE); | ||||
|  | ||||
|   gtk_print_backend_add_printer (GTK_PRINT_BACKEND (backend), printer); | ||||
|  | ||||
| @ -396,7 +396,7 @@ gtk_print_backend_lpr_init (GtkPrintBackendLpr *backend) | ||||
| 			     GTK_PRINT_BACKEND (backend), | ||||
| 			     TRUE);  | ||||
|   gtk_printer_set_has_details (printer, TRUE); | ||||
|   gtk_printer_set_icon_name (printer, "gtk-print"); | ||||
|   gtk_printer_set_icon_name (printer, "printer"); | ||||
|   gtk_printer_set_is_active (printer, TRUE); | ||||
|   gtk_printer_set_is_default (printer, TRUE); | ||||
|  | ||||
|  | ||||
| @ -606,7 +606,7 @@ papi_get_printer_list (GtkPrintBackendPapi *papi_backend) | ||||
| 		    gtk_printer_set_is_default (printer, TRUE); | ||||
| 	  	  }	 | ||||
|  | ||||
|               gtk_printer_set_icon_name (printer, "gtk-print"); | ||||
|               gtk_printer_set_icon_name (printer, "printer"); | ||||
| 	      gtk_print_backend_add_printer (backend, printer); | ||||
|               gtk_printer_set_is_active (printer, TRUE); | ||||
|  | ||||
|  | ||||
| @ -475,7 +475,7 @@ gtk_print_backend_test_init (GtkPrintBackendTest *backend) | ||||
|       g_message ("TEST Backend: Adding printer %d\n", i); | ||||
|  | ||||
|       gtk_printer_set_has_details (printer, FALSE); | ||||
|       gtk_printer_set_icon_name (printer, "gtk-delete"); /* use a delete icon just for fun */ | ||||
|       gtk_printer_set_icon_name (printer, "edit-delete"); /* use a delete icon just for fun */ | ||||
|       gtk_printer_set_is_active (printer, TRUE); | ||||
|  | ||||
|       gtk_print_backend_add_printer (GTK_PRINT_BACKEND (backend), printer); | ||||
|  | ||||
		Reference in New Issue
	
	Block a user
	 Matthias Clasen
					Matthias Clasen