@@ -1026,10 +1026,8 @@ mate_panel_applet_get_preferred_width (GtkWidget *widget,
10261026 * they are back at their own intended size.
10271027 */
10281028 scale = gtk_widget_get_scale_factor (widget );
1029- if (scale ) {
1030- * minimum_width /= scale ;
1031- * natural_width /= scale ;
1032- }
1029+ * minimum_width /= scale ;
1030+ * natural_width /= scale ;
10331031 }
10341032}
10351033
@@ -1050,10 +1048,8 @@ mate_panel_applet_get_preferred_height (GtkWidget *widget,
10501048 * they are back at their own intended size.
10511049 */
10521050 scale = gtk_widget_get_scale_factor (widget );
1053- if (scale ) {
1054- * minimum_height /= scale ;
1055- * natural_height /= scale ;
1056- }
1051+ * minimum_height /= scale ;
1052+ * natural_height /= scale ;
10571053 }
10581054}
10591055
@@ -1063,6 +1059,9 @@ mate_panel_applet_get_request_mode (GtkWidget *widget)
10631059 MatePanelApplet * applet = MATE_PANEL_APPLET (widget );
10641060 MatePanelAppletOrient orientation ;
10651061
1062+ if (applet -> priv -> out_of_process )
1063+ return GTK_SIZE_REQUEST_CONSTANT_SIZE ;
1064+
10661065 orientation = mate_panel_applet_get_orient (applet );
10671066 if (orientation == MATE_PANEL_APPLET_ORIENT_UP ||
10681067 orientation == MATE_PANEL_APPLET_ORIENT_DOWN )
@@ -1500,9 +1499,9 @@ mate_panel_applet_change_background(MatePanelApplet *applet,
15001499 GdkWindow * window ;
15011500
15021501 if (applet -> priv -> out_of_process )
1503- window = gtk_widget_get_window (applet -> priv -> plug );
1502+ window = gtk_widget_get_window (GTK_WIDGET ( applet -> priv -> plug ) );
15041503 else
1505- window = gtk_widget_get_window GTK_WIDGET ( (applet ));
1504+ window = gtk_widget_get_window ( GTK_WIDGET (applet ));
15061505
15071506 gtk_widget_set_app_paintable (GTK_WIDGET (applet ),TRUE);
15081507
0 commit comments