Fork from Ubuntu's indicator-printers.

11 files changed, 16 insertions, 25 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 064efc8..55ee4fa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,3 @@
-
 printersmenulibdir = $(INDICATORDIR)
 printersmenulib_LTLIBRARIES = libprintersmenu.la
 libprintersmenu_la_SOURCES = \
@@ -28,8 +27,8 @@ $(cups_notifier_sources): org.cups.cupsd.Notifier.xml
 	    $^
 
 
-pkglibexec_PROGRAMS = indicator-printers-service
-indicator_printers_service_SOURCES = \
+pkglibexec_PROGRAMS = ayatana-indicator-printers-service
+ayatana_indicator_printers_service_SOURCES = \
 	indicator-printers-service.c \
 	indicator-printers-menu.c \
 	indicator-printers-menu.h \
@@ -39,15 +38,16 @@ indicator_printers_service_SOURCES = \
 	spawn-printer-settings.h \
 	dbus-names.h
 
-nodist_indicator_printers_service_SOURCES = $(cups_notifier_sources)
-
-indicator_printers_service_CPPFLAGS = $(SERVICE_CFLAGS)
-indicator_printers_service_CFLAGS = $(COVERAGE_CFLAGS)
-indicator_printers_service_LDADD = $(SERVICE_LIBS)
-indicator_printers_service_LDFLAGS = $(COVERAGE_LDFLAGS)
+nodist_ayatana_indicator_printers_service_SOURCES = $(cups_notifier_sources)
 
+ayatana_indicator_printers_service_CPPFLAGS = $(SERVICE_CFLAGS)
+ayatana_indicator_printers_service_CFLAGS = $(COVERAGE_CFLAGS)
+ayatana_indicator_printers_service_LDADD = $(SERVICE_LIBS)
+ayatana_indicator_printers_service_LDFLAGS = $(COVERAGE_LDFLAGS)
 
 BUILT_SOURCES = $(cups_notifier_sources)
 CLEANFILES= $(BUILT_SOURCES)
 EXTRA_DIST = org.cups.cupsd.Notifier.xml
 
+DISTCLEANFILES = \
+	Makefile.in
\ No newline at end of file
diff --git a/src/dbus-names.h b/src/dbus-names.h
index 0dac6e7..6913ffc 100644
--- a/src/dbus-names.h
+++ b/src/dbus-names.h
@@ -19,9 +19,9 @@
 #ifndef DBUS_NAMES_H
 #define DBUS_NAMES_H
 
-#define INDICATOR_PRINTERS_DBUS_NAME "com.canonical.indicator.printers"
-#define INDICATOR_PRINTERS_DBUS_OBJECT_PATH "/com/canonical/indicator/printers"
-#define INDICATOR_PRINTERS_DBUS_INTERFACE "com.canonical.indicator.printers"
+#define INDICATOR_PRINTERS_DBUS_NAME "org.ayatana.indicator.printers"
+#define INDICATOR_PRINTERS_DBUS_OBJECT_PATH "/org/ayatana/indicator/printers"
+#define INDICATOR_PRINTERS_DBUS_INTERFACE "org.ayatana.indicator.printers"
 #define INDICATOR_PRINTERS_DBUS_VERSION 1
 
 #define CUPS_DBUS_NAME "org.cups.cupsd.Notifier"
@@ -29,4 +29,3 @@
 #define CUPS_DBUS_INTERFACE "org.cups.cupsd.Notifier"
 
 #endif
-
diff --git a/src/indicator-menu-item.c b/src/indicator-menu-item.c
index dcd9f75..94e10ba 100644
--- a/src/indicator-menu-item.c
+++ b/src/indicator-menu-item.c
@@ -401,4 +401,3 @@ indicator_menu_item_set_icon_name (IndicatorMenuItem *self,
     gtk_image_set_from_icon_name (self->priv->image, name, GTK_ICON_SIZE_MENU);
     g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_ICON_NAME]);
 }
-
diff --git a/src/indicator-menu-item.h b/src/indicator-menu-item.h
index d3c7b0c..84d6b74 100644
--- a/src/indicator-menu-item.h
+++ b/src/indicator-menu-item.h
@@ -79,4 +79,3 @@ void indicator_menu_item_set_icon_name (IndicatorMenuItem *self, const gchar *na
 G_END_DECLS
 
 #endif
-
diff --git a/src/indicator-printer-state-notifier.c b/src/indicator-printer-state-notifier.c
index 08a7ecb..9d3e9f2 100644
--- a/src/indicator-printer-state-notifier.c
+++ b/src/indicator-printer-state-notifier.c
@@ -330,4 +330,3 @@ indicator_printer_state_notifier_set_cups_notifier (IndicatorPrinterStateNotifie
                           G_CALLBACK (on_printer_state_changed), self);
     }
 }
-
diff --git a/src/indicator-printer-state-notifier.h b/src/indicator-printer-state-notifier.h
index d0a2504..de5f176 100644
--- a/src/indicator-printer-state-notifier.h
+++ b/src/indicator-printer-state-notifier.h
@@ -72,4 +72,3 @@ void indicator_printer_state_notifier_set_cups_notifier (IndicatorPrinterStateNo
 G_END_DECLS
 
 #endif
-
diff --git a/src/indicator-printers-menu.c b/src/indicator-printers-menu.c
index ef42169..636cb1e 100644
--- a/src/indicator-printers-menu.c
+++ b/src/indicator-printers-menu.c
@@ -336,4 +336,3 @@ indicator_printers_menu_set_cups_notifier (IndicatorPrintersMenu *self,
                           NULL);
     }
 }
-
diff --git a/src/indicator-printers-menu.h b/src/indicator-printers-menu.h
index c5b8172..c10f221 100644
--- a/src/indicator-printers-menu.h
+++ b/src/indicator-printers-menu.h
@@ -74,4 +74,3 @@ void indicator_printers_menu_set_cups_notifier (IndicatorPrintersMenu *self,
 G_END_DECLS
 
 #endif
-
diff --git a/src/indicator-printers-service.c b/src/indicator-printers-service.c
index b8d15da..50c2b15 100644
--- a/src/indicator-printers-service.c
+++ b/src/indicator-printers-service.c
@@ -16,7 +16,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libindicator/indicator-service.h>
+#include <libayatana-indicator/indicator-service.h>
 #include <libdbusmenu-glib/dbusmenu-glib.h>
 #include <gtk/gtk.h>
 #include <cups/cups.h>
@@ -203,4 +203,3 @@ int main (int argc, char *argv[])
     g_object_unref (cups_notifier);
     return 0;
 }
-
diff --git a/src/indicator-printers.c b/src/indicator-printers.c
index 56e91d4..c52fdaa 100644
--- a/src/indicator-printers.c
+++ b/src/indicator-printers.c
@@ -26,8 +26,8 @@
 #include <gtk/gtk.h>
 #include <gio/gio.h>
 
-#include <libindicator/indicator.h>
-#include <libindicator/indicator-image-helper.h>
+#include <libayatana-indicator/indicator.h>
+#include <libayatana-indicator/indicator-image-helper.h>
 
 #include <libdbusmenu-gtk/menu.h>
 #include <libdbusmenu-gtk/menuitem.h>
@@ -308,4 +308,3 @@ indicator_printers_new (void)
 {
     return g_object_new (INDICATOR_PRINTERS_TYPE, NULL);
 }
-
diff --git a/src/indicator-printers.h b/src/indicator-printers.h
index 78d2367..51b790c 100644
--- a/src/indicator-printers.h
+++ b/src/indicator-printers.h
@@ -19,7 +19,7 @@
 #ifndef INDICATOR_PRINTERS_H
 #define INDICATOR_PRINTERS_H
 
-#include <libindicator/indicator-object.h>
+#include <libayatana-indicator/indicator-object.h>
 
 G_BEGIN_DECLS