Rename namespace of notifications com.google.filesystems.libfuse

com.github.osxfuse.libosxfuse
osxfuse · Jul 5, 2011 · 7e585c0 · 7e585c0
1 parent 585d037
commit 7e585c0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 20 deletions.
diff --git a/include/fuse_darwin.h b/include/fuse_darwin.h
@@ -65,30 +65,25 @@ typedef fuse_sem_t sem_t;
 
 /* Notifications */
 
-#define LIBFUSE_BUNDLE_IDENTIFIER "com.google.filesystems.libfuse"
+#define LIBOSXFUSE_BUNDLE_IDENTIFIER "com.github.osxfuse.libosxfuse"
 
-#define LIBFUSE_UNOTIFICATIONS_OBJECT                 \
-    LIBFUSE_BUNDLE_IDENTIFIER ".unotifications"
+#define LIBOSXFUSE_UNOTIFICATIONS_OBJECT                 \
+    LIBOSXFUSE_BUNDLE_IDENTIFIER ".unotifications"
 
-#define LIBFUSE_UNOTIFICATIONS_NOTIFY_OSISTOONEW      \
-    LIBFUSE_BUNDLE_IDENTIFIER ".osistoonew"
+#define LIBOSXFUSE_UNOTIFICATIONS_NOTIFY_OSISTOONEW      \
+    LIBOSXFUSE_BUNDLE_IDENTIFIER ".osistoonew"
 
-#define LIBFUSE_UNOTIFICATIONS_NOTIFY_OSISTOOOLD      \
-    LIBFUSE_BUNDLE_IDENTIFIER ".osistooold"                    
+#define LIBOSXFUSE_UNOTIFICATIONS_NOTIFY_OSISTOOOLD      \
+    LIBOSXFUSE_BUNDLE_IDENTIFIER ".osistooold"                    
 
-#define LIBFUSE_UNOTIFICATIONS_NOTIFY_RUNTIMEVERSIONMISMATCH \
-    LIBFUSE_BUNDLE_IDENTIFIER ".runtimeversionmismatch"
+#define LIBOSXFUSE_UNOTIFICATIONS_NOTIFY_RUNTIMEVERSIONMISMATCH \
+    LIBOSXFUSE_BUNDLE_IDENTIFIER ".runtimeversionmismatch"
 
-#define LIBFUSE_UNOTIFICATIONS_NOTIFY_VERSIONMISMATCH \
-    LIBFUSE_BUNDLE_IDENTIFIER ".versionmismatch"
+#define LIBOSXFUSE_UNOTIFICATIONS_NOTIFY_VERSIONMISMATCH \
+    LIBOSXFUSE_BUNDLE_IDENTIFIER ".versionmismatch"
 
 /* Versioning */
-
-#ifdef MACFUSE
-const char *macfuse_version(void);
-#else
 const char *osxfuse_version(void);
-#endif
 long        fuse_os_version_major_np(void);
 
 /* Advanced */

diff --git a/lib/mount_darwin.c b/lib/mount_darwin.c
@@ -139,7 +139,7 @@ post_notification(char   *name,
     nf_name = CFStringCreateWithCString(kCFAllocatorDefault, name, encoding);
 
     nf_object = CFStringCreateWithCString(kCFAllocatorDefault,
-                                          LIBFUSE_UNOTIFICATIONS_OBJECT,
+                                          LIBOSXFUSE_UNOTIFICATIONS_OBJECT,
                                           encoding);
 
     nf_udata = CFDictionaryCreateMutable(kCFAllocatorDefault,
@@ -503,7 +503,7 @@ fuse_mount_core(const char *mountpoint, const char *opts)
                 );
             }
             post_notification(
-                LIBFUSE_UNOTIFICATIONS_NOTIFY_OSISTOOOLD, NULL, NULL, 0);
+                LIBOSXFUSE_UNOTIFICATIONS_NOTIFY_OSISTOOOLD, NULL, NULL, 0);
         } else if (result == EBUSY) {
             if (!quiet_mode) {
                 CFUserNotificationDisplayNotice(
@@ -517,7 +517,7 @@ fuse_mount_core(const char *mountpoint, const char *opts)
                     CFSTR("OK")
                 );
             }
-            post_notification(LIBFUSE_UNOTIFICATIONS_NOTIFY_VERSIONMISMATCH,
+            post_notification(LIBOSXFUSE_UNOTIFICATIONS_NOTIFY_VERSIONMISMATCH,
                               NULL, NULL, 0);
         }
         fprintf(stderr, "the OSXFUSE file system is not available (%d)\n",
@@ -557,7 +557,7 @@ fuse_mount_core(const char *mountpoint, const char *opts)
                 CFSTR("OK")
             );
         }
-        post_notification(LIBFUSE_UNOTIFICATIONS_NOTIFY_RUNTIMEVERSIONMISMATCH,
+        post_notification(LIBOSXFUSE_UNOTIFICATIONS_NOTIFY_RUNTIMEVERSIONMISMATCH,
                           NULL, NULL, 0);
         fprintf(stderr,
                 "this OSXFUSE library version is incompatible with "