Merge pull request #10 from Agalin/disable_unload

Disable unload

Author: Agalin

Pidgin MacOS Integration.xcodeproj/project.pbxproj

@@ -377,6 +377,7 @@
 					"/usr/local/opt/pidgin/include/**",
 					/usr/local/opt/gettext/include,
 					/usr/local/opt/pidgin/include/libpurple/,
+					"/usr/local/opt/harfbuzz/include/**",
 				);
 			};
 			name = Debug;
@@ -452,6 +453,7 @@
 					"/usr/local/opt/pidgin/include/**",
 					/usr/local/opt/gettext/include,
 					/usr/local/opt/pidgin/include/libpurple/,
+					"/usr/local/opt/harfbuzz/include/**",
 				);
 			};
 			name = Release;

Pidgin MacOS Integration/main.c

@@ -28,8 +28,7 @@ plugin_load(PurplePlugin *plugin) {
 }
 
 static gboolean plugin_unload(PurplePlugin *plugin) {
-    plugin_unload_oc(plugin);
-    return TRUE;
+    return FALSE;
 }
 
 static PurplePluginInfo info = {
@@ -44,7 +43,7 @@ static PurplePluginInfo info = {
 
     "gtk-agalin-macos_integration",
     "MacOS Integration",
-    "0.1",
+    "0.1.1",
 
     "MacOS shell integration for Pidgin",
     "MacOS shell integration for Pidgin. Provides integration with Cocoa through GTK OSX Application module. Adds support for native message notifications, attention requests, moves menu to top menubar as in native app, moves some menu options like preferences or about to standard macOS locations.",

Pidgin MacOS Integration/main.swift

@@ -491,12 +491,6 @@ enum GTypes : UInt {
         setConversationMenuForEachWindow(visible: false)
     }
 
-    @objc func pluginUnload(plugin: UnsafeMutablePointer<PurplePlugin>) {
-        unsetMenu()
-        purple_signals_disconnect_by_handle(plugin);
-        NSApp.delegate = nil
-    }
-    
     static func forceRedraw(widget: UnsafeMutablePointer<GtkWidget>?) {
         gtk_widget_queue_draw(widget)
         while (gtk_events_pending () != 0)

Pidgin MacOS Integration/plugin_load.h

@@ -28,7 +28,6 @@ void log_all(const char* category, const char* message);
 void log_critical(const char* category, const char* message);
 
 void plugin_load_oc(PurplePlugin *plugin);
-void plugin_unload_oc(PurplePlugin *plugin);
 void plugin_init_oc(PurplePlugin *plugin);
 
 void (*conv_test(void))(void);

Pidgin MacOS Integration/plugin_load.m

@@ -12,9 +12,6 @@
 
 void log_callback(const char* category, const char* message, const char* callback);
 
-static Plugin* instance;
-static PurplePlugin* pplugin;
-
 GtkWidget* get_config_frame(PurplePlugin* plugin) {
     return [Plugin getConfigFrame:plugin];
 }
@@ -32,18 +29,10 @@
 
 void plugin_load_oc(PurplePlugin *plugin) {
     log_critical("macos", "Load\n");
-    instance = [[Plugin alloc]init];
-    pplugin = plugin;
+    Plugin* instance = [[Plugin alloc]init];
     [instance pluginLoadWithPlugin:plugin];
 }
 
-void plugin_unload_oc(PurplePlugin *plugin) {
-    log_critical("macos", "Unload\n");
-    [instance pluginUnloadWithPlugin:plugin];
-    instance = nil;
-    pplugin = nil;
-}
-
 void plugin_init_oc(PurplePlugin *plugin) {
     log_critical("macos", "Init\n");
 //    bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");