[metacity/wip/gtk-theme: 1/51] remove common.c, include everything in library



commit 0cc61a2b33bc90f285b92bcafca0959b77e535d3
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed Dec 31 23:23:08 2014 +0200

    remove common.c, include everything in library

 src/Makefile.am   |   94 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 src/core/common.c |   34 -------------------
 src/core/frame.c  |    4 --
 3 files changed, 89 insertions(+), 43 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 2853294..a0b1135 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -75,7 +75,6 @@ metacity_SOURCES=                             \
        core/workspace.h                        \
        core/xprops.c                           \
        include/xprops.h                        \
-       core/common.c \
        include/common.h                        \
        include/core.h                          \
        include/ui.h                            \
@@ -108,20 +107,105 @@ metacity_SOURCES=                                \
 # metacity proper will be compiled with different names.
 libmetacity_private_la_CFLAGS =
 libmetacity_private_la_SOURCES=                        \
+       core/async-getprop.c                    \
+       core/async-getprop.h                    \
+       core/atomnames.h                        \
+       core/bell.c                             \
+       core/bell.h                             \
        core/boxes.c                            \
        include/boxes.h                         \
+       compositor/compositor.c                 \
+       compositor/compositor-private.h         \
+       compositor/compositor-xrender.c         \
+       compositor/compositor-xrender.h         \
+       include/compositor.h                    \
+       core/above-tab-keycode.c                \
+       core/constraints.c                      \
+       core/constraints.h                      \
+       core/core.c                             \
+       core/delete.c                           \
+       core/display.c                          \
+       core/display-private.h                  \
+       include/display.h                       \
+       ui/draw-workspace.c                     \
+       ui/draw-workspace.h                     \
+       core/edge-resistance.c                  \
+       core/edge-resistance.h                  \
+       core/effects.c                          \
+       core/effects.h                          \
+       core/errors.c                           \
+       include/errors.h                        \
+       core/eventqueue.c                       \
+       core/eventqueue.h                       \
+       core/frame.c                            \
+       core/frame-private.h                    \
+       include/frame.h                         \
        ui/gradient.c                           \
        ui/gradient.h                           \
+       core/group-private.h                    \
+       core/group-props.c                      \
+       core/group-props.h                      \
+       core/group.c                            \
+       core/group.h                            \
+       core/iconcache.c                        \
+       core/iconcache.h                        \
+       core/keybindings.c                      \
+       core/keybindings.h                      \
+       core/main.c                             \
+       include/main.h                          \
+       core/metacity-Xatomtype.h               \
+       core/place.c                            \
+       core/place.h                            \
+       core/prefs.c                            \
+       include/prefs.h                         \
+       core/screen.c                           \
+       core/screen-private.h                   \
+       include/screen.h                        \
+       include/types.h                         \
+       core/session.c                          \
+       core/session.h                          \
+       core/stack.c                            \
+       core/stack.h                            \
        core/util.c                             \
        include/util.h                          \
-       core/common.c \
+       core/window-props.c                     \
+       core/window-props.h                     \
+       core/window.c                           \
+       core/window-private.h                   \
+       include/window.h                        \
+       core/workspace.c                        \
+       core/workspace.h                        \
+       core/xprops.c                           \
+       include/xprops.h                        \
        include/common.h                        \
-       ui/preview-widget.c                     \
-       ui/preview-widget.h                     \
+       include/core.h                          \
+       include/ui.h                            \
+       ui/fixedtip.c                           \
+       ui/fixedtip.h                           \
+       ui/frames.c                             \
+       ui/frames.h                             \
+       ui/menu.c                               \
+       ui/menu.h                               \
+       ui/metaaccellabel.c                     \
+       ui/metaaccellabel.h                     \
+       ui/preview-widget.c                     \
+       ui/preview-widget.h                     \
+       ui/resizepopup.c                        \
+       include/resizepopup.h                   \
+       ui/tabpopup.c                           \
+       include/tabpopup.h                      \
+       ui/select-image.c                       \
+       ui/select-image.h                       \
+       ui/select-workspace.c                   \
+       ui/select-workspace.h                   \
+       ui/tile-preview.c                       \
+       include/tile-preview.h                  \
        ui/theme-parser.c                       \
        ui/theme-parser.h                       \
        ui/theme.c                              \
-       ui/theme.h
+       ui/theme.h                              \
+       ui/ui.c                                 \
+       include/all-keybindings.h
 
 libmetacity_private_la_LDFLAGS = -no-undefined -version-info 2:0:0
 libmetacity_private_la_LIBADD  = @METACITY_LIBS@
diff --git a/src/core/frame.c b/src/core/frame.c
index 76f7979..e172758 100644
--- a/src/core/frame.c
+++ b/src/core/frame.c
@@ -299,9 +299,6 @@ meta_frame_get_flags (MetaFrame *frame)
   return flags;
 }
 
-/* Moved to core/common.c
- */
-#if 0
 void
 meta_frame_borders_clear (MetaFrameBorders *self)
 {
@@ -310,7 +307,6 @@ meta_frame_borders_clear (MetaFrameBorders *self)
   self->visible.left = 0;
   self->visible.right = 0;
 }
-#endif
 
 void
 meta_frame_calc_borders (MetaFrame        *frame,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]