libmetacity: use callback function to get button state

1 files changed, 1 insertions, 59 deletions

diff --git a/libmetacity/meta-theme-gtk.c b/libmetacity/meta-theme-gtk.c
index 708526d6..9fcf25b2 100644
--- a/libmetacity/meta-theme-gtk.c
+++ b/libmetacity/meta-theme-gtk.c
@@ -734,64 +734,6 @@ get_class_from_button_function (MetaButtonFunction function)
 }
 
 static void
-get_button_rect (MetaButtonFunction       function,
-                 const MetaFrameGeometry *fgeom,
-                 GdkRectangle            *rect)
-{
-  switch (function)
-    {
-    case META_BUTTON_FUNCTION_CLOSE:
-      *rect = fgeom->close_rect.visible;
-      break;
-
-    case META_BUTTON_FUNCTION_SHADE:
-      *rect = fgeom->shade_rect.visible;
-      break;
-
-    case META_BUTTON_FUNCTION_UNSHADE:
-      *rect = fgeom->unshade_rect.visible;
-      break;
-
-    case META_BUTTON_FUNCTION_ABOVE:
-      *rect = fgeom->above_rect.visible;
-      break;
-
-    case META_BUTTON_FUNCTION_UNABOVE:
-      *rect = fgeom->unabove_rect.visible;
-      break;
-
-    case META_BUTTON_FUNCTION_STICK:
-      *rect = fgeom->stick_rect.visible;
-      break;
-
-    case META_BUTTON_FUNCTION_UNSTICK:
-      *rect = fgeom->unstick_rect.visible;
-      break;
-
-    case META_BUTTON_FUNCTION_MAXIMIZE:
-      *rect = fgeom->max_rect.visible;
-      break;
-
-    case META_BUTTON_FUNCTION_MINIMIZE:
-      *rect = fgeom->min_rect.visible;
-      break;
-
-    case META_BUTTON_FUNCTION_MENU:
-      *rect = fgeom->menu_rect.visible;
-      break;
-
-    case META_BUTTON_FUNCTION_APPMENU:
-      *rect = fgeom->appmenu_rect.visible;
-      break;
-
-    case META_BUTTON_FUNCTION_LAST:
-    default:
-      g_assert_not_reached ();
-      break;
-    }
-}
-
-static void
 meta_theme_gtk_draw_frame (MetaThemeImpl           *impl,
                            MetaFrameStyle          *style,
                            MetaStyleInfo           *style_info,
@@ -909,7 +851,7 @@ meta_theme_gtk_draw_frame (MetaThemeImpl           *impl,
 
       cairo_save (cr);
 
-      get_button_rect (button_function, fgeom, &tmp_rect);
+      get_button_rect_for_function (button_function, fgeom, &tmp_rect);
 
       button_rect.x = tmp_rect.x / scale;
       button_rect.y = tmp_rect.y / scale;