[gnome-disk-utility/udisks2-port] Prepare project tree for port to udisks2
- From: David Zeuthen <davidz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-disk-utility/udisks2-port] Prepare project tree for port to udisks2
- Date: Fri, 4 Mar 2011 17:23:56 +0000 (UTC)
commit 2a9bf912f6cb28469a9ea0ea4de1f4d2b3cf9276
Author: David Zeuthen <davidz redhat com>
Date: Fri Mar 4 09:57:34 2011 -0500
Prepare project tree for port to udisks2
For now, nuke everything since
- libgdu is essentially replaced with libudisks2
- we don't want help files at all (help has been an empty doc
since the start)
- the nautilus formatting extension should probably be in Nautilus
proper, not here
- the notification daemon for SMART should probably be part of
gnome-settings-daemon
basically leaving Palimpsest as the only thing we need here. And since
we want to move to using e.g. glade directly in the project, all that
code needs to be redone anyway. Of course we will still re-use a lot
of the existing code (it will be copy-pasted in), so this is far from
a total rewrite.
Signed-off-by: David Zeuthen <davidz redhat com>
COPYING | 2 +-
Makefile.am | 17 +-
TODO | 2 -
configure.ac | 206 +--
data/Makefile.am | 15 +-
data/gdu-notification-daemon.desktop.in.in.in | 14 -
doc/Makefile.am | 5 -
doc/version.xml.in | 1 -
help/C/figures/main-app.png | Bin 76956 -> 0 bytes
help/C/legal.xml | 76 -
help/C/palimpsest.xml | 91 -
help/Makefile.am | 12 -
help/cs/cs.po | 133 -
help/cs/figures/main-app.png | Bin 169979 -> 0 bytes
help/de/de.po | 132 -
help/el/el.po | 233 --
help/es/es.po | 231 --
help/es/figures/main-app.png | Bin 119911 -> 0 bytes
help/palimpsest.omf.in | 37 -
help/pl/pl.po | 137 -
help/pt_BR/pt_BR.po | 227 --
help/sl/sl.po | 140 -
help/sv/sv.po | 127 -
help/zh_CN/zh_CN.po | 203 --
po/POTFILES.in | 64 +-
po/POTFILES.skip | 2 -
src/Makefile.am | 6 +-
src/format-tool/Makefile.am | 46 -
src/format-tool/TODO | 62 -
src/format-tool/gdu-format-progress-dialog.c | 265 --
src/format-tool/gdu-format-progress-dialog.h | 63 -
src/format-tool/gdu-format-tool.c | 586 ----
src/gdu-gtk/Makefile.am | 148 -
src/gdu-gtk/gdu-add-component-linux-md-dialog.c | 383 ---
src/gdu-gtk/gdu-add-component-linux-md-dialog.h | 64 -
src/gdu-gtk/gdu-add-pv-linux-lvm2-dialog.c | 402 ---
src/gdu-gtk/gdu-add-pv-linux-lvm2-dialog.h | 63 -
src/gdu-gtk/gdu-ata-smart-dialog.c | 2255 -------------
src/gdu-gtk/gdu-ata-smart-dialog.h | 63 -
src/gdu-gtk/gdu-button-element.c | 306 --
src/gdu-gtk/gdu-button-element.h | 79 -
src/gdu-gtk/gdu-button-table.c | 400 ---
src/gdu-gtk/gdu-button-table.h | 66 -
src/gdu-gtk/gdu-confirmation-dialog.c | 286 --
src/gdu-gtk/gdu-confirmation-dialog.h | 73 -
src/gdu-gtk/gdu-connect-to-server-dialog.c | 320 --
src/gdu-gtk/gdu-connect-to-server-dialog.h | 61 -
src/gdu-gtk/gdu-create-linux-lvm2-volume-dialog.c | 230 --
src/gdu-gtk/gdu-create-linux-lvm2-volume-dialog.h | 65 -
src/gdu-gtk/gdu-create-linux-md-dialog.c | 980 ------
src/gdu-gtk/gdu-create-linux-md-dialog.h | 66 -
src/gdu-gtk/gdu-create-partition-dialog.c | 246 --
src/gdu-gtk/gdu-create-partition-dialog.h | 69 -
src/gdu-gtk/gdu-details-element.c | 599 ----
src/gdu-gtk/gdu-details-element.h | 103 -
src/gdu-gtk/gdu-details-table.c | 509 ---
src/gdu-gtk/gdu-details-table.h | 66 -
src/gdu-gtk/gdu-dialog.c | 207 --
src/gdu-gtk/gdu-dialog.h | 63 -
src/gdu-gtk/gdu-disk-selection-widget.c | 1338 --------
src/gdu-gtk/gdu-disk-selection-widget.h | 72 -
src/gdu-gtk/gdu-drive-benchmark-dialog.c | 1332 --------
src/gdu-gtk/gdu-drive-benchmark-dialog.h | 63 -
src/gdu-gtk/gdu-edit-linux-lvm2-dialog.c | 962 ------
src/gdu-gtk/gdu-edit-linux-lvm2-dialog.h | 64 -
src/gdu-gtk/gdu-edit-linux-md-dialog.c | 887 -----
src/gdu-gtk/gdu-edit-linux-md-dialog.h | 68 -
src/gdu-gtk/gdu-edit-name-dialog.c | 367 --
src/gdu-gtk/gdu-edit-name-dialog.h | 70 -
src/gdu-gtk/gdu-edit-partition-dialog.c | 484 ---
src/gdu-gtk/gdu-edit-partition-dialog.h | 66 -
src/gdu-gtk/gdu-error-dialog.c | 385 ---
src/gdu-gtk/gdu-error-dialog.h | 73 -
src/gdu-gtk/gdu-format-dialog.c | 701 ----
src/gdu-gtk/gdu-format-dialog.h | 78 -
src/gdu-gtk/gdu-gtk-enums.h | 122 -
src/gdu-gtk/gdu-gtk-enumtypes.c.template | 39 -
src/gdu-gtk/gdu-gtk-enumtypes.h | 29 -
src/gdu-gtk/gdu-gtk-enumtypes.h.template | 24 -
src/gdu-gtk/gdu-gtk-types.h | 71 -
src/gdu-gtk/gdu-gtk.c | 1781 ----------
src/gdu-gtk/gdu-gtk.h | 134 -
src/gdu-gtk/gdu-gtk.pc.in | 11 -
src/gdu-gtk/gdu-partition-dialog.c | 290 --
src/gdu-gtk/gdu-partition-dialog.h | 64 -
src/gdu-gtk/gdu-pool-tree-model.c | 613 ----
src/gdu-gtk/gdu-pool-tree-model.h | 66 -
src/gdu-gtk/gdu-pool-tree-view.c | 436 ---
src/gdu-gtk/gdu-pool-tree-view.h | 63 -
src/gdu-gtk/gdu-size-widget.c | 666 ----
src/gdu-gtk/gdu-size-widget.h | 72 -
src/gdu-gtk/gdu-time-label.c | 231 --
src/gdu-gtk/gdu-time-label.h | 60 -
src/gdu-gtk/gdu-volume-grid.c | 1666 ---------
src/gdu-gtk/gdu-volume-grid.h | 69 -
src/gdu/Makefile.am | 129 -
src/gdu/gdu-adapter.c | 327 --
src/gdu/gdu-adapter.h | 77 -
src/gdu/gdu-callbacks.h | 225 --
src/gdu/gdu-device.c | 2866 ----------------
src/gdu/gdu-device.h | 410 ---
src/gdu/gdu-drive.c | 1492 ---------
src/gdu/gdu-drive.h | 142 -
src/gdu/gdu-error.c | 98 -
src/gdu/gdu-error.h | 76 -
src/gdu/gdu-expander.c | 355 --
src/gdu/gdu-expander.h | 78 -
src/gdu/gdu-hub.c | 383 ---
src/gdu/gdu-hub.h | 63 -
src/gdu/gdu-known-filesystem.c | 194 --
src/gdu/gdu-known-filesystem.h | 74 -
src/gdu/gdu-linux-lvm2-volume-group.c | 1063 ------
src/gdu/gdu-linux-lvm2-volume-group.h | 82 -
src/gdu/gdu-linux-lvm2-volume-hole.c | 331 --
src/gdu/gdu-linux-lvm2-volume-hole.h | 61 -
src/gdu/gdu-linux-lvm2-volume.c | 524 ---
src/gdu/gdu-linux-lvm2-volume.h | 64 -
src/gdu/gdu-linux-md-drive.c | 1142 -------
src/gdu/gdu-linux-md-drive.h | 107 -
src/gdu/gdu-machine.c | 246 --
src/gdu/gdu-machine.h | 60 -
src/gdu/gdu-marshal.list | 3 -
src/gdu/gdu-pool.c | 3536 --------------------
src/gdu/gdu-pool.h | 201 --
src/gdu/gdu-port.c | 317 --
src/gdu/gdu-port.h | 76 -
src/gdu/gdu-presentable.c | 660 ----
src/gdu/gdu-presentable.h | 113 -
src/gdu/gdu-private.h | 160 -
src/gdu/gdu-process.c | 189 --
src/gdu/gdu-process.h | 67 -
src/gdu/gdu-ssh-bridge.c | 624 ----
src/gdu/gdu-ssh-bridge.h | 37 -
src/gdu/gdu-types.h | 69 -
src/gdu/gdu-util.c | 1160 -------
src/gdu/gdu-util.h | 91 -
src/gdu/gdu-volume-hole.c | 355 --
src/gdu/gdu-volume-hole.h | 60 -
src/gdu/gdu-volume.c | 980 ------
src/gdu/gdu-volume.h | 85 -
src/gdu/gdu.h | 57 -
src/gdu/gdu.pc.in | 11 -
src/nautilus-extension/Makefile.am | 47 -
src/nautilus-extension/nautilus-gdu.c | 302 --
src/nautilus-extension/nautilus-gdu.h | 57 -
src/nautilus-extension/nautilus-module.c | 58 -
src/notification/Makefile.am | 44 -
src/notification/gdu-slow-unmount-dialog.c | 309 --
src/notification/gdu-slow-unmount-dialog.h | 60 -
src/notification/notification-main.c | 551 ---
src/palimpsest/Makefile.am | 41 +-
src/palimpsest/gdu-main.c | 210 --
src/palimpsest/gdu-section-drive.c | 1060 ------
src/palimpsest/gdu-section-drive.h | 69 -
src/palimpsest/gdu-section-hub.c | 290 --
src/palimpsest/gdu-section-hub.h | 58 -
.../gdu-section-linux-lvm2-volume-group.c | 790 -----
.../gdu-section-linux-lvm2-volume-group.h | 58 -
src/palimpsest/gdu-section-linux-md-drive.c | 1107 ------
src/palimpsest/gdu-section-linux-md-drive.h | 58 -
src/palimpsest/gdu-section-volumes.c | 2608 ---------------
src/palimpsest/gdu-section-volumes.h | 60 -
src/palimpsest/gdu-section.c | 203 --
src/palimpsest/gdu-section.h | 65 -
src/palimpsest/gdu-shell.c | 1192 -------
src/palimpsest/gdu-shell.h | 70 -
src/palimpsest/main.c | 33 +
167 files changed, 47 insertions(+), 53697 deletions(-)
---
diff --git a/COPYING b/COPYING
index 2833606..55e3b86 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (C) 2008 David Zeuthen.
+Copyright (C) 2008-2011 David Zeuthen <zeuthen gmail com>
All Rights Reserved.
All source code in the gnome-disk-utility project is licensed to you
diff --git a/Makefile.am b/Makefile.am
index 3cb31c3..1acd002 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,19 +1,4 @@
-SUBDIRS = src data doc help po
-
-EXTRA_DIST = \
- autogen.sh \
- intltool-extract.in \
- intltool-merge.in \
- intltool-update.in \
- gnome-doc-utils.make \
- TODO
-
-DISTCLEANFILES = \
- intltool-extract \
- intltool-merge \
- intltool-update
+SUBDIRS = src data po
clean-local :
rm -f *~ po/*~
-
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
diff --git a/configure.ac b/configure.ac
index 001edf5..576bfe1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,17 +7,6 @@ AC_CONFIG_HEADERS([config.h])
AM_MAINTAINER_MODE
-# libtool versioning - this applies to all libraries in this package
-#
-# See http://sources.redhat.com/autobook/autobook/autobook_91.html#SEC91 for details
-#
-LT_CURRENT=0
-LT_REVISION=0
-LT_AGE=0
-AC_SUBST(LT_CURRENT)
-AC_SUBST(LT_REVISION)
-AC_SUBST(LT_AGE)
-
AC_PROG_CC
AC_ISC_POSIX
AC_HEADER_STDC
@@ -25,172 +14,24 @@ AC_PROG_LIBTOOL
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-#### gcc warning flags
-
-AC_ARG_ENABLE(ansi, AS_HELP_STRING([--enable-ansi],
- [enable -ansi -pedantic gcc flags]),
- enable_ansi=$enableval,enable_ansi=no)
-
-if test "x$GCC" = "xyes"; then
- changequote(,)dnl
- case " $CFLAGS " in
- *[\ \ ]-Wall[\ \ ]*) ;;
- *) CFLAGS="$CFLAGS -Wall" ;;
- esac
-
- case " $CFLAGS " in
- *[\ \ ]-Wchar-subscripts[\ \ ]*) ;;
- *) CFLAGS="$CFLAGS -Wchar-subscripts" ;;
- esac
-
- case " $CFLAGS " in
- *[\ \ ]-Wmissing-declarations[\ \ ]*) ;;
- *) CFLAGS="$CFLAGS -Wmissing-declarations" ;;
- esac
-
- case " $CFLAGS " in
- *[\ \ ]-Wnested-externs[\ \ ]*) ;;
- *) CFLAGS="$CFLAGS -Wnested-externs" ;;
- esac
-
- case " $CFLAGS " in
- *[\ \ ]-Wpointer-arith[\ \ ]*) ;;
- *) CFLAGS="$CFLAGS -Wpointer-arith" ;;
- esac
-
- case " $CFLAGS " in
- *[\ \ ]-Wcast-align[\ \ ]*) ;;
- *) CFLAGS="$CFLAGS -Wcast-align" ;;
- esac
-
- case " $CFLAGS " in
- *[\ \ ]-Wsign-compare[\ \ ]*) ;;
- *) CFLAGS="$CFLAGS -Wsign-compare" ;;
- esac
-
- case " $CFLAGS " in
- *[\ \ ]-Wformat[\ \ ]*) ;;
- *) CFLAGS="$CFLAGS -Wformat" ;;
- esac
-
- case " $CFLAGS " in
- *[\ \ ]-Wformat-security[\ \ ]*) ;;
- *) CFLAGS="$CFLAGS -Wformat-security" ;;
- esac
-
- if test "x$enable_ansi" = "xyes"; then
- case " $CFLAGS " in
- *[\ \ ]-ansi[\ \ ]*) ;;
- *) CFLAGS="$CFLAGS -ansi" ;;
- esac
-
- case " $CFLAGS " in
- *[\ \ ]-D_POSIX_C_SOURCE*) ;;
- *) CFLAGS="$CFLAGS -D_POSIX_C_SOURCE=199309L" ;;
- esac
-
- case " $CFLAGS " in
- *[\ \ ]-D_BSD_SOURCE[\ \ ]*) ;;
- *) CFLAGS="$CFLAGS -D_BSD_SOURCE" ;;
- esac
-
- case " $CFLAGS " in
- *[\ \ ]-pedantic[\ \ ]*) ;;
- *) CFLAGS="$CFLAGS -pedantic" ;;
- esac
- fi
- changequote([,])dnl
-fi
-
# *****
# GNOME
# *****
GNOME_COMMON_INIT
-GNOME_DOC_INIT
GNOME_DEBUG_CHECK
GNOME_COMPILE_WARNINGS([maximum])
GNOME_MAINTAINER_MODE_DEFINES
-AC_ARG_ENABLE(gtk-doc, AS_HELP_STRING([--enable-gtk-doc],
- [use gtk-doc to build documentation [default=no]]),,
- enable_gtk_doc=no)
-GTK_DOC_CHECK([1.3])
-
# ***************************
# Check for required packages
# ***************************
GLIB2_REQUIRED=2.22
-GOBJECT2_REQUIRED=2.16
-GIO2_REQUIRED=2.22
-DBUS_GLIB_REQUIRED=0.74
-GNOME_KEYRING_REQUIRED=2.22
-GTK3_REQUIRED=2.90.7
-UNIQUE_REQUIRED=2.90.1
-LIBNOTIFY_REQUIRED=0.6.1
-NAUTILUS_REQUIRED=2.24.0
-AVAHI_UI_REQUIRED=0.6.25
+UDISKS2_REQUIRED=1.90
-UDISKS_REQUIRED=1.0.0
-UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION=1.1.0
-
-SCROLLKEEPER_REQUIRED=0.3.14
-INTLTOOL_REQUIRED=0.35.0
-
-PKG_CHECK_MODULES(GLIB2, [glib-2.0 >= $GLIB2_REQUIRED])
-PKG_CHECK_MODULES(GOBJECT2, [gobject-2.0 >= $GOBJECT2_REQUIRED])
-PKG_CHECK_MODULES(GIO2, [gio-2.0 >= $GIO2_REQUIRED])
-PKG_CHECK_MODULES(GIO_UNIX2, [gio-unix-2.0 >= $GIO2_REQUIRED])
-PKG_CHECK_MODULES(GTHREAD2, [gthread-2.0 >= $GLIB2_REQUIRED])
-PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= $DBUS_GLIB_REQUIRED])
-PKG_CHECK_MODULES(GTK3, [gtk+-3.0 >= $GTK3_REQUIRED])
-PKG_CHECK_MODULES(UNIQUE, [unique-3.0 >= $UNIQUE_REQUIRED])
-PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= $LIBNOTIFY_REQUIRED])
-PKG_CHECK_MODULES(UDISKS, [udisks >= $UDISKS_REQUIRED udisks < $UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION])
-PKG_CHECK_MODULES(X11, [x11])
-PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14])
-PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui-gtk3 >= $AVAHI_UI_REQUIRED])
-
-# *************
-# Remote Access
-# *************
-have_remote_access=no
-AC_ARG_ENABLE(remote_access, AS_HELP_STRING([--disable-remote-access], [disable access to remote udisks daemons]))
-if test "x$enable_remote_access" != "xno"; then
- AC_DEFINE(HAVE_REMOTE_ACCESS, 1, [Defined if remote access is enabled])
- have_remote_access=yes
-fi
-AM_CONDITIONAL(HAVE_REMOTE_ACCESS, [test "$have_remote_access" = "yes"])
-
-# *************
-# GNOME Keyring
-# *************
-
-have_gnome_keyring=no
-AC_ARG_ENABLE(gnome-keyring, AS_HELP_STRING([--disable-gnome-keyring], [disable use of GNOME Keyring]))
-
-if test "x$enable_gnome_keyring" != "xno"; then
- PKG_CHECK_MODULES(GNOME_KEYRING, gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED,
- [AC_DEFINE(HAVE_GNOME_KEYRING, 1, [Define if gnome-keyring is available])
- have_gnome_keyring=yes], have_gnome_keyring=no)
- if test "x$have_gnome_keyring" = xno -a "x$enable_gnome_keyring" = xyes; then
- AC_MSG_ERROR([gnome-keyring support requested but libraries not found])
- fi
-fi
-
-AC_SUBST(GNOME_KEYRING_LIBS)
-AC_SUBST(GNOME_KEYRING_CFLAGS)
-AM_CONDITIONAL(ENABLE_GNOME_KEYRING, [test "$have_gnome_keyring" = "yes"])
-
-# *************
-# Documentation
-# *************
-
-AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
-if test x$SCROLLKEEPER_CONFIG = xno; then
- AC_MSG_ERROR(Could not find scrollkeeper-config, please install the scrollkeeper package)
-fi
+PKG_CHECK_MODULES(GLIB2, [gio-2.0 >= $GLIB2_REQUIRED])
+PKG_CHECK_MODULES(UDISKS2, [udisks2 >= $UDISKS2_REQUIRED])
# ********************
# Internationalization
@@ -203,31 +44,6 @@ AC_SUBST([GETTEXT_PACKAGE])
AM_GLIB_GNU_GETTEXT
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext domain])
-# ******************
-# Nautilus extension
-# ******************
-
-have_nautilus=no
-AC_ARG_ENABLE(nautilus, AS_HELP_STRING([--disable-nautilus], [disable nautilus extension]))
-
-if test "x$enable_nautilus" != "xno"; then
- PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED,
- [AC_DEFINE(HAVE_NAUTILUS, 1, [Define if nautilus is available])
- have_nautilus=yes], have_nautilus=no)
- if test "x$have_nautilus" = xno -a "x$enable_nautilus" = xyes; then
- AC_MSG_ERROR([nautilus support requested but libraries not found])
- fi
-fi
-
-AC_SUBST(NAUTILUS_LIBS)
-AC_SUBST(NAUTILUS_CFLAGS)
-AC_SUBST(NAUTILUS_EXTENSION_DIR)
-
-AM_CONDITIONAL(ENABLE_NAUTILUS, [test "$have_nautilus" = "yes"])
-
-# *************************************
-# *************************************
-
AC_SUBST([AM_CPPFLAGS])
AC_SUBST([AM_CFLAGS])
AC_SUBST([AM_CXXFLAGS])
@@ -236,26 +52,15 @@ AC_SUBST([AM_LDFLAGS])
AC_CONFIG_FILES([
Makefile
src/Makefile
-src/gdu/Makefile
-src/gdu/gdu.pc
-src/gdu-gtk/Makefile
-src/gdu-gtk/gdu-gtk.pc
src/palimpsest/Makefile
-src/notification/Makefile
-src/format-tool/Makefile
-src/nautilus-extension/Makefile
po/Makefile.in
data/Makefile
-data/gdu-notification-daemon.desktop.in.in
data/icons/Makefile
data/icons/16x16/Makefile
data/icons/22x22/Makefile
data/icons/24x24/Makefile
data/icons/48x48/Makefile
data/icons/scalable/Makefile
-help/Makefile
-doc/Makefile
-doc/version.xml
])
AC_OUTPUT
@@ -278,9 +83,4 @@ echo "
cppflags: ${CPPFLAGS}
Maintainer mode: ${USE_MAINTAINER_MODE}
- Building api docs: ${enable_gtk_doc}
- Nautilus extension: ${have_nautilus}
-
- GNOME Keyring support: ${have_gnome_keyring}
- Remote Access: ${have_remote_access}
"
diff --git a/data/Makefile.am b/data/Makefile.am
index 785368d..1a13cc8 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -6,27 +6,14 @@ desktopdir = $(datadir)/applications
desktop_in_files = palimpsest.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-autostartdir = $(sysconfdir)/xdg/autostart
-autostart_in_files = gdu-notification-daemon.desktop.in
-autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-
-gdu-notification-daemon.desktop.in: gdu-notification-daemon.desktop.in.in
- @sed -e "s|\ LIBEXECDIR\@|$(libexecdir)|" $< > $@
-
@INTLTOOL_DESKTOP_RULE@
-distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper
-
EXTRA_DIST = \
$(desktop_in_files) \
- $(autostart_in_files) \
$(NULL)
CLEANFILES = \
- $(desktop_DATA) \
- $(autostart_DATA) \
- gdu-notification-daemon.desktop.in \
- gdu-notification-daemon.desktop.in.in \
+ $(desktop_DATA) \
$(NULL)
clean-local :
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3a7562c..e9c070a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,66 +2,4 @@
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
data/palimpsest.desktop.in
-data/gdu-notification-daemon.desktop.in.in.in
-src/format-tool/gdu-format-progress-dialog.c
-src/format-tool/gdu-format-tool.c
-src/gdu-gtk/gdu-add-component-linux-md-dialog.c
-src/gdu-gtk/gdu-add-pv-linux-lvm2-dialog.c
-src/gdu-gtk/gdu-ata-smart-dialog.c
-src/gdu-gtk/gdu-button-element.c
-src/gdu-gtk/gdu-button-table.c
-src/gdu-gtk/gdu-confirmation-dialog.c
-src/gdu-gtk/gdu-connect-to-server-dialog.c
-src/gdu-gtk/gdu-create-linux-lvm2-volume-dialog.c
-src/gdu-gtk/gdu-create-linux-md-dialog.c
-src/gdu-gtk/gdu-create-partition-dialog.c
-src/gdu-gtk/gdu-details-element.c
-src/gdu-gtk/gdu-details-table.c
-src/gdu-gtk/gdu-dialog.c
-src/gdu-gtk/gdu-disk-selection-widget.c
-src/gdu-gtk/gdu-drive-benchmark-dialog.c
-src/gdu-gtk/gdu-edit-name-dialog.c
-src/gdu-gtk/gdu-edit-linux-lvm2-dialog.c
-src/gdu-gtk/gdu-edit-linux-md-dialog.c
-src/gdu-gtk/gdu-edit-partition-dialog.c
-src/gdu-gtk/gdu-error-dialog.c
-src/gdu-gtk/gdu-format-dialog.c
-src/gdu-gtk/gdu-gtk.c
-src/gdu-gtk/gdu-partition-dialog.c
-src/gdu-gtk/gdu-pool-tree-model.c
-src/gdu-gtk/gdu-pool-tree-view.c
-src/gdu-gtk/gdu-size-widget.c
-src/gdu-gtk/gdu-time-label.c
-src/gdu-gtk/gdu-volume-grid.c
-src/nautilus-extension/nautilus-gdu.c
-src/nautilus-extension/nautilus-module.c
-src/gdu/gdu-adapter.c
-src/gdu/gdu-device.c
-src/gdu/gdu-drive.c
-src/gdu/gdu-error.c
-src/gdu/gdu-expander.c
-src/gdu/gdu-hub.c
-src/gdu/gdu-known-filesystem.c
-src/gdu/gdu-linux-lvm2-volume.c
-src/gdu/gdu-linux-lvm2-volume-group.c
-src/gdu/gdu-linux-lvm2-volume-hole.c
-src/gdu/gdu-linux-md-drive.c
-src/gdu/gdu-machine.c
-src/gdu/gdu-pool.c
-src/gdu/gdu-port.c
-src/gdu/gdu-presentable.c
-src/gdu/gdu-process.c
-src/gdu/gdu-ssh-bridge.c
-src/gdu/gdu-util.c
-src/gdu/gdu-volume.c
-src/gdu/gdu-volume-hole.c
-src/notification/gdu-slow-unmount-dialog.c
-src/notification/notification-main.c
-src/palimpsest/gdu-main.c
-src/palimpsest/gdu-section.c
-src/palimpsest/gdu-section-drive.c
-src/palimpsest/gdu-section-hub.c
-src/palimpsest/gdu-section-linux-lvm2-volume-group.c
-src/palimpsest/gdu-section-linux-md-drive.c
-src/palimpsest/gdu-section-volumes.c
-src/palimpsest/gdu-shell.c
+src/palimpsest/main.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 9a744c4..ab68185 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,4 +1,2 @@
# List of files where to skip translations.
# Please keep this file sorted alphabetically.
-data/gdu-notification-daemon.desktop.in
-data/gdu-notification-daemon.desktop.in.in
diff --git a/src/Makefile.am b/src/Makefile.am
index bab902f..e851430 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,4 @@
-SUBDIRS = gdu gdu-gtk palimpsest notification format-tool
-
-if ENABLE_NAUTILUS
-SUBDIRS += nautilus-extension
-endif
+SUBDIRS = palimpsest
clean-local :
rm -f *~
diff --git a/src/palimpsest/Makefile.am b/src/palimpsest/Makefile.am
index 912da87..9f1382e 100644
--- a/src/palimpsest/Makefile.am
+++ b/src/palimpsest/Makefile.am
@@ -4,14 +4,7 @@ NULL =
bin_PROGRAMS = palimpsest
palimpsest_SOURCES = \
- gdu-main.c \
- gdu-shell.h gdu-shell.c \
- gdu-section.h gdu-section.c \
- gdu-section-linux-md-drive.h gdu-section-linux-md-drive.c \
- gdu-section-linux-lvm2-volume-group.h gdu-section-linux-lvm2-volume-group.c \
- gdu-section-drive.h gdu-section-drive.c \
- gdu-section-volumes.h gdu-section-volumes.c \
- gdu-section-hub.h gdu-section-hub.c \
+ main.c \
$(NULL)
palimpsest_CPPFLAGS = \
@@ -19,39 +12,17 @@ palimpsest_CPPFLAGS = \
-I$(top_builddir)/src/ \
-DG_LOG_DOMAIN=\"Palimpsest\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- $(DISABLE_DEPRECATED) \
- -DGDU_API_IS_SUBJECT_TO_CHANGE \
- -DGDU_GTK_API_IS_SUBJECT_TO_CHANGE \
- $(AM_CPPFLAGS)
+ $(NULL)
palimpsest_CFLAGS = \
$(GLIB2_CFLAGS) \
- $(GOBJECT2_CFLAGS) \
- $(GIO2_CFLAGS) \
- $(GIO_UNIX2_CFLAGS) \
- $(DBUS_GLIB_CFLAGS) \
- $(GNOME_KEYRING_CFLAGS) \
- $(GTK3_CFLAGS) \
- $(UNIQUE_CFLAGS) \
- $(X11_CFLAGS) \
- $(WARN_CFLAGS) \
- $(AM_CFLAGS)
-
-palimpsest_LDFLAGS = \
- $(AM_LDFLAGS)
+ $(UDISKS2_CFLAGS) \
+ $(NULL)
palimpsest_LDADD = \
$(GLIB2_LIBS) \
- $(GIO2_LIBS) \
- $(GIO_UNIX2_LIBS) \
- $(DBUS_GLIB_LIBS) \
- $(GNOME_KEYRING_LIBS) \
- $(GTK3_LIBS) \
- $(UNIQUE_LIBS) \
- $(X11_LIBS) \
- $(INTLLIBS) \
- $(top_builddir)/src/gdu/libgdu.la \
- $(top_builddir)/src/gdu-gtk/libgdu-gtk.la
+ $(UDISKS2_LIBS) \
+ $(NULL)
clean-local :
rm -f *~
diff --git a/src/palimpsest/main.c b/src/palimpsest/main.c
new file mode 100644
index 0000000..090ed26
--- /dev/null
+++ b/src/palimpsest/main.c
@@ -0,0 +1,33 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+/*
+ * Copyright (C) 2008-2011 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: David Zeuthen <davidz redhat com>
+ */
+
+#include "config.h"
+#include <glib/gi18n.h>
+
+#include <glib.h>
+
+int
+main (int argc, char *argv[])
+{
+ g_print (_("Hello world!\n"));
+ return 0;
+}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
