fix build warnings

docs/_static/css/zoitechat-docs.css

@@ -78,11 +78,6 @@ a {
     text-decoration: none;
 }
 
-::selection {
-    background: var(--accent);
-    color: #fff8ea;
-}
-
 button,
 input,
 textarea,
@@ -144,7 +139,6 @@ select {
     z-index: 2000;
     border-bottom: 3px solid var(--rule);
     background: rgba(238, 229, 211, 0.94);
-    -webkit-backdrop-filter: blur(8px);
     backdrop-filter: blur(8px);
 }
 
@@ -237,17 +231,6 @@ select {
     font-weight: 900;
 }
 
-.site-nav a[aria-current="page"] {
-    border-block-color: var(--rule);
-    background: var(--panel-dark);
-    color: var(--paper-warm);
-    box-shadow: inset 0 -0.3rem 0 var(--accent);
-}
-
-.site-nav a[aria-current="page"]::before {
-    color: #d19b25;
-}
-
 .site-nav a:hover,
 .site-nav a:focus-visible {
     border-block-color: var(--rule);
@@ -528,7 +511,6 @@ select {
     font-weight: 900;
     line-height: 1.18;
     box-shadow: 4px 4px 0 var(--rule);
-    touch-action: manipulation;
     transition: transform 0.12s ease, background-color 0.12s ease, color 0.12s ease, box-shadow 0.12s ease;
 }
 
@@ -545,11 +527,6 @@ select {
     outline: none;
 }
 
-.button:active {
-    transform: translate(3px, 3px);
-    box-shadow: none;
-}
-
 .button-primary {
     background: var(--accent);
     color: #fff8ea;
@@ -1199,11 +1176,6 @@ select {
     color: rgba(255, 248, 234, 0.82);
 }
 
-.footer-links a {
-    width: fit-content;
-    border-bottom: 1px solid transparent;
-}
-
 .footer-links a::before {
     color: #d19b25;
     content: "↳ ";
@@ -1212,7 +1184,6 @@ select {
 .footer-links a:hover,
 .footer-links a:focus-visible {
     color: #fff8ea;
-    border-bottom-color: currentColor;
     outline: none;
 }
 
@@ -1375,70 +1346,6 @@ select {
         animation-iteration-count: 1 !important;
     }
 }
-
-/* Automatic dark appearance, matching the main ZoiteChat site palette. */
-@media (prefers-color-scheme: dark) {
-    :root {
-        color-scheme: dark;
-        --paper: #161514;
-        --paper-warm: #f4ead9;
-        --paper-cool: #1c2522;
-        --ink: #f2eadb;
-        --ink-soft: #ddd2c1;
-        --muted: #bdb19f;
-        --quiet: #928777;
-        --rule: #080706;
-        --rule-soft: rgba(242, 234, 219, 0.16);
-        --rule-mid: rgba(242, 234, 219, 0.3);
-        --panel: #211e1a;
-        --panel-alt: #2b261f;
-        --panel-dark: #0b0c0c;
-        --accent: #c34720;
-        --accent-dark: #ff966d;
-        --accent-soft: rgba(195, 71, 32, 0.17);
-        --green: #367662;
-        --blue: #386b8d;
-        --warning: #9b6508;
-        --success: #43856a;
-        --shadow: 8px 8px 0 rgba(0, 0, 0, 0.82);
-        --shadow-soft: 0 18px 40px rgba(0, 0, 0, 0.36);
-    }
-
-    html {
-        background: var(--paper);
-    }
-
-    body {
-        background:
-            linear-gradient(90deg, rgba(242, 234, 219, 0.025) 1px, transparent 1px) 0 0 / 68px 68px,
-            linear-gradient(180deg, rgba(242, 234, 219, 0.022) 1px, transparent 1px) 0 0 / 68px 68px,
-            radial-gradient(circle at 11% 18%, rgba(195, 71, 32, 0.15), transparent 24rem),
-            radial-gradient(circle at 86% 4%, rgba(54, 118, 98, 0.16), transparent 28rem),
-            linear-gradient(180deg, #181715 0%, #111311 58%, #191714 100%);
-    }
-
-    body::before {
-        background:
-            repeating-linear-gradient(90deg, transparent 0 17px, rgba(242, 234, 219, 0.025) 17px 18px),
-            repeating-linear-gradient(0deg, transparent 0 5px, rgba(255, 255, 255, 0.025) 5px 6px);
-        mix-blend-mode: screen;
-    }
-
-    .site-header {
-        background: rgba(22, 21, 20, 0.94);
-    }
-
-    .site-nav a,
-    .nav-menu summary {
-        background: rgba(39, 35, 30, 0.52);
-    }
-
-    .eyebrow::before,
-    .footer-links a::before {
-        color: #e0aa3c;
-    }
-}
-
 /* Sphinx/Read the Docs bridge: aggressively map documentation onto the main ZoiteChat site skin. */
 html {
     font-size: 16px !important;
@@ -1578,17 +1485,6 @@ body a {
     font-weight: 900 !important;
 }
 
-#navbar-top .site-nav a[aria-current="page"] {
-    border-block-color: var(--rule) !important;
-    background: var(--panel-dark) !important;
-    color: var(--paper-warm) !important;
-    box-shadow: inset 0 -0.3rem 0 var(--accent) !important;
-}
-
-#navbar-top .site-nav a[aria-current="page"]::before {
-    color: #d19b25 !important;
-}
-
 #navbar-top .site-nav a:hover,
 #navbar-top .site-nav a:focus-visible,
 #navbar-top .site-nav summary:hover,
@@ -1775,7 +1671,6 @@ footer.site-footer-lite {
 }
 
 .document .body p {
-    max-width: 78ch;
     margin: 0 0 1rem !important;
 }
 
@@ -1821,7 +1716,6 @@ ul.search a:focus-visible {
 
 .document .body ul,
 .document .body ol {
-    max-width: 78ch;
     margin: 0.75rem 0 1.4rem !important;
     padding-left: 1.35rem !important;
 }
@@ -1971,11 +1865,6 @@ ul.search a:focus-visible {
     text-transform: uppercase !important;
 }
 
-.document .body table tbody tr:hover td,
-.document .body table tbody tr:focus-within td {
-    background: var(--accent-soft) !important;
-}
-
 .admonition,
 .note,
 .warning,
@@ -2115,7 +2004,6 @@ input[type="submit"],
     line-height: 1.18 !important;
     text-shadow: none !important;
     box-shadow: 4px 4px 0 var(--rule) !important;
-    touch-action: manipulation;
 }
 
 .btn:hover,
@@ -2131,13 +2019,6 @@ input[type="submit"]:focus-visible {
     outline: none !important;
 }
 
-.btn:active,
-button:active,
-input[type="submit"]:active {
-    transform: translate(3px, 3px) !important;
-    box-shadow: none !important;
-}
-
 #navbar-related {
     min-height: auto !important;
     margin: 1rem 0 1.5rem !important;
@@ -2394,37 +2275,3 @@ footer:not(.site-footer) {
         letter-spacing: -0.04em !important;
     }
 }
-
-/* Keep basicstrap's stronger overrides readable with the main site's dark palette. */
-@media (prefers-color-scheme: dark) {
-    #navbar-top.site-header {
-        background: rgba(22, 21, 20, 0.94) !important;
-    }
-
-    #navbar-top .site-nav a,
-    #navbar-top .site-nav summary {
-        background: rgba(39, 35, 30, 0.52) !important;
-    }
-
-    .document::after,
-    .sidebar::after,
-    #navbar-related::after {
-        background: linear-gradient(135deg, transparent 50%, rgba(242, 234, 219, 0.09) 50%) !important;
-    }
-
-    input[type="text"],
-    input[type="search"],
-    .search-query,
-    .form-control,
-    textarea,
-    select {
-        background: var(--panel) !important;
-        box-shadow: inset 3px 3px 0 rgba(0, 0, 0, 0.32) !important;
-    }
-
-    .warning,
-    .caution,
-    .danger {
-        background: #3a2e19 !important;
-    }
-}

docs/_theme/basicstrap/layout.html

@@ -209,8 +209,6 @@
     {%- endif %}
     <meta name="description" content="">
     <meta name="author" content="">
-    <meta name="theme-color" content="#eee5d3" media="(prefers-color-scheme: light)">
-    <meta name="theme-color" content="#161514" media="(prefers-color-scheme: dark)">
 
     {{ css() }}
     {%- if not embedded %}
@@ -262,9 +260,8 @@
         <nav class="site-nav" aria-label="Primary">
           <a href="https://zoitechat.org/">Home</a>
           <a href="https://zoitechat.org/addons.php">Addons</a>
-          <a href="https://zoitechat.org/announcements.php">Announcements</a>
           <a href="https://zoitechat.org/download.php">Download</a>
-          <a href="{{ pathto(master_doc) }}" aria-current="page">Docs</a>
+          <a href="{{ pathto(master_doc) }}">Docs</a>
           <a href="https://github.com/ZoiteChat/zoitechat" target="_blank" rel="noopener">GitHub</a>
           <details class="nav-menu">
             <summary>IRC Support</summary>
@@ -339,7 +336,6 @@
           <div class="footer-links">
             <a href="https://zoitechat.org/download.php">Download</a>
             <a href="https://zoitechat.org/addons.php">Addons</a>
-            <a href="https://zoitechat.org/announcements.php">Announcements</a>
             <a href="https://zoitechat.org/privacy.php">Privacy Policy</a>
             <a href="{{ pathto(master_doc) }}">Documentation</a>
             <a href="https://github.com/ZoiteChat/zoitechat" target="_blank" rel="noopener">Source code</a>

src/common/fe.h

@@ -70,9 +70,6 @@ void fe_add_rawlog (struct server *serv, char *text, int len, int outbound);
 #define FE_MSG_ERROR 8
 #define FE_MSG_MARKUP 16
 void fe_message (char *msg, int flags);
-#ifdef __linux__
-void fe_root_warning (void);
-#endif
 #define FIA_READ 1
 #define FIA_WRITE 2
 #define FIA_EX 4

src/common/outbound.c

@@ -2826,7 +2826,6 @@ static gboolean
 client_tag_allowed (server *serv, const char *tag)
 {
 	char **deny;
-	gboolean blocked = FALSE;
 	int i;
 
 	if (!serv->have_message_tags)
@@ -2838,16 +2837,15 @@ client_tag_allowed (server *serv, const char *tag)
 	deny = g_strsplit (serv->clienttagdeny, ",", 0);
 	for (i = 0; deny[i]; i++)
 	{
-		if (!strcmp (deny[i], "*"))
+		if (!strcmp (deny[i], "*") || !strcmp (deny[i], tag) || (deny[i][0] == '+' && !strcmp (deny[i] + 1, tag)))
-			blocked = TRUE;
+		{
-		else if (deny[i][0] == '-' && !strcmp (deny[i] + 1, tag))
+			g_strfreev (deny);
-			blocked = FALSE;
+			return FALSE;
-		else if (!strcmp (deny[i], tag) || (deny[i][0] == '+' && !strcmp (deny[i] + 1, tag)))
+		}
-			blocked = TRUE;
 	}
 
 	g_strfreev (deny);
-	return !blocked;
+	return TRUE;
 }
 
 static char *

src/common/zoitechat.c

@@ -95,7 +95,6 @@ int zoitechat_is_quitting = FALSE;
 /* command-line args */
 int arg_dont_autoconnect = FALSE;
 int arg_skip_plugins = FALSE;
-gint arg_run_as_root = FALSE;
 char *arg_url = NULL;
 char **arg_urls = NULL;
 char *arg_command = NULL;
@@ -1176,25 +1175,6 @@ main (int argc, char *argv[])
 	HRESULT coinit_result;
 #endif
 
-#ifdef __linux__
-	for (i = 1; i < argc; i++)
-	{
-		if (strcmp (argv[i], "--") == 0)
-			break;
-		if (strcmp (argv[i], "--run-as-root") == 0)
-		{
-			arg_run_as_root = TRUE;
-			break;
-		}
-	}
-
-	if (geteuid () == 0 && !arg_run_as_root)
-	{
-		fe_root_warning ();
-		return EXIT_FAILURE;
-	}
-#endif
-
 	srand ((unsigned int) time (NULL)); /* CL: do this only once! */
 
 	/* We must check for the config dir parameter, otherwise load_config() will behave incorrectly.
@@ -1283,7 +1263,7 @@ main (int argc, char *argv[])
 #ifndef WIN32
 #ifndef __EMX__
 	/* OS/2 uses UID 0 all the time */
-	if (getuid () == 0 && !arg_run_as_root)
+	if (getuid () == 0)
 		fe_message (_("* Running IRC as root is stupid! You should\n"
 			      "  create a User Account and use that to login.\n"), FE_MSG_WARN|FE_MSG_WAIT);
 #endif

src/common/zoitechat.h

@@ -450,7 +450,6 @@ typedef struct session
 	int mode_timeout_tag;
 	int typing_timeout_tag;
 	int typing_status;
-	gint64 typing_last_sent;
 	int typing_animation_tag;
 	int typing_animation_frame;
 

src/common/zoitechatc.h

@@ -25,7 +25,6 @@ extern struct zoitechatprefs prefs;
 extern int zoitechat_is_quitting;
 extern gint arg_skip_plugins;	/* command-line args */
 extern gint arg_dont_autoconnect;
-extern gint arg_run_as_root;
 extern char *arg_url;
 extern char **arg_urls;
 extern char *arg_command;

src/fe-gtk/fe-gtk.c

@@ -90,9 +90,6 @@ static const GOptionEntry gopt_entries[] =
  {"no-auto",	'a', 0, G_OPTION_ARG_NONE,	&arg_dont_autoconnect, N_("Don't auto connect to servers"), NULL},
  {"cfgdir",	'd', 0, G_OPTION_ARG_STRING,	&arg_cfgdir, N_("Use a different config directory"), "PATH"},
  {"no-plugins",	'n', 0, G_OPTION_ARG_NONE,	&arg_skip_plugins, N_("Don't auto load any plugins"), NULL},
-#ifdef __linux__
- {"run-as-root", 0, 0, G_OPTION_ARG_NONE, &arg_run_as_root, N_("Allow ZoiteChat to run as root (unsafe)"), NULL},
-#endif
  {"plugindir",	'p', 0, G_OPTION_ARG_NONE,	&arg_show_autoload, N_("Show plugin/script auto-load directory"), NULL},
  {"configdir",	'u', 0, G_OPTION_ARG_NONE,	&arg_show_config, N_("Show user config directory"), NULL},
  {"url",	 0,  G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &arg_url, N_("Open an irc://server:port/channel?key URL"), "URL"},
@@ -106,33 +103,6 @@ static const GOptionEntry gopt_entries[] =
  {NULL}
 };
 
-#ifdef __linux__
-void
-fe_root_warning (void)
-{
-	const char *message =
-		"ZoiteChat refuses to run as root on Linux.\n\n"
-		"Run it as a normal user, or pass --run-as-root to override this protection.";
-	GtkWidget *dialog;
-
-	g_printerr ("%s\n", message);
-
-	/* A graphical session may not be accessible to root, particularly under
-	 * Wayland. Keep stderr as the fallback if GTK cannot open the display. */
-	if (!gtk_init_check (NULL, NULL))
-		return;
-
-	dialog = gtk_message_dialog_new (NULL,
-	                                 GTK_DIALOG_MODAL,
-	                                 GTK_MESSAGE_ERROR,
-	                                 GTK_BUTTONS_CLOSE,
-	                                 "%s", message);
-	gtk_window_set_title (GTK_WINDOW (dialog), "ZoiteChat");
-	gtk_dialog_run (GTK_DIALOG (dialog));
-	gtk_widget_destroy (dialog);
-}
-#endif
-
 #ifdef WIN32
 static void
 create_msg_dialog (gchar *title, gchar *message)

src/fe-gtk/maingui.c

@@ -778,13 +778,10 @@ mg_inputbox_focus (GtkWidget *widget, GdkEventFocus *event, session_gui *gui)
 }
 
 
-#define TYPING_THROTTLE_USEC (3 * G_USEC_PER_SEC)
-
 static gboolean
 mg_client_tag_allowed (server *serv, const char *tag)
 {
         char **deny;
-        gboolean blocked = FALSE;
         int i;
 
         if (!serv->have_message_tags)
@@ -796,42 +793,30 @@ mg_client_tag_allowed (server *serv, const char *tag)
         deny = g_strsplit (serv->clienttagdeny, ",", 0);
         for (i = 0; deny[i]; i++)
         {
-                if (!strcmp (deny[i], "*"))
+                if (!strcmp (deny[i], "*") || !strcmp (deny[i], tag) || (deny[i][0] == '+' && !strcmp (deny[i] + 1, tag)))
-                        blocked = TRUE;
+                {
-                else if (deny[i][0] == '-' && !strcmp (deny[i] + 1, tag))
+                        g_strfreev (deny);
-                        blocked = FALSE;
+                        return FALSE;
-                else if (!strcmp (deny[i], tag) || (deny[i][0] == '+' && !strcmp (deny[i] + 1, tag)))
+                }
-                        blocked = TRUE;
         }
 
         g_strfreev (deny);
-        return !blocked;
+        return TRUE;
 }
 
-static gboolean
+static void
-mg_typing_can_send (session *sess)
-{
-        gint64 now = g_get_monotonic_time ();
-
-        return sess->typing_last_sent == 0 ||
-               now - sess->typing_last_sent >= TYPING_THROTTLE_USEC;
-}
-
-static gboolean
 mg_send_typing (session *sess, const char *state)
 {
         char tags[32];
 
         if (!sess || !sess->server->connected || !mg_client_tag_allowed (sess->server, "typing") || !sess->channel[0])
-                return FALSE;
+                return;
 
         if (sess->type != SESS_CHANNEL && sess->type != SESS_DIALOG)
-                return FALSE;
+                return;
 
         g_snprintf (tags, sizeof (tags), "+typing=%s", state);
         sess->server->p_tagmsg (sess->server, tags, sess->channel);
-        sess->typing_last_sent = g_get_monotonic_time ();
-        return TRUE;
 }
 
 static int
@@ -860,15 +845,17 @@ mg_typing_update (session *sess, const char *text)
 
         if (!text || !*text || text[0] == prefs.hex_input_command_char[0])
         {
-                if (sess->typing_status && mg_typing_can_send (sess))
+                if (sess->typing_status)
                         mg_send_typing (sess, "done");
                 sess->typing_status = 0;
                 return;
         }
 
-        if (mg_typing_can_send (sess))
+        if (sess->typing_status != 1)
+        {
                 mg_send_typing (sess, "active");
-        sess->typing_status = 1;
+                sess->typing_status = 1;
+        }
         sess->typing_timeout_tag = fe_timeout_add_seconds (6, mg_typing_pause_cb, sess);
 }
 

src/fe-gtk/sexy-spell-entry.c

@@ -1266,6 +1266,8 @@ attr_list_has_attrs (PangoAttrList *attrs)
 static void
 sexy_spell_entry_recheck_all(SexySpellEntry *entry)
 {
+	GdkRectangle rect;
+	GtkAllocation allocation;
 	GtkWidget *widget = GTK_WIDGET(entry);
 	int length, i, text_len;
 	const char *text;
@@ -1297,8 +1299,15 @@ sexy_spell_entry_recheck_all(SexySpellEntry *entry)
 
 	gtk_entry_set_attributes (GTK_ENTRY (entry), attr_list_has_attrs (entry->priv->attr_list) ? entry->priv->attr_list : NULL);
 
-	/* GtkEntry shares its parent's GdkWindow in GTK3; redraw the widget area. */
+	if (gtk_widget_get_realized (GTK_WIDGET(entry)))
-	gtk_widget_queue_draw (widget);
+	{
+		gtk_widget_get_allocation (GTK_WIDGET(entry), &allocation);
+		
+		rect.x = 0; rect.y = 0;
+		rect.width  = allocation.width;
+		rect.height = allocation.height;
+		gdk_window_invalidate_rect(gtk_widget_get_window (widget), &rect, TRUE);
+	}
 }
 
 static gboolean

src/fe-gtk/theme/theme-manager.c

@@ -683,7 +683,7 @@ theme_manager_get_userlist_palette_behavior (const PangoFontDescription *font_de
 
 	behavior.font_desc = font_desc;
 	behavior.apply_background = TRUE;
-	behavior.apply_foreground = prefs.hex_gui_ulist_color ? FALSE : TRUE;
+	behavior.apply_foreground = (prefs.hex_gui_ulist_color || prefs.hex_text_color_nicks) ? FALSE : TRUE;
 
 	return behavior;
 }

src/fe-gtk/userlistgui.c

@@ -594,7 +594,7 @@ fe_userlist_rehash (session *sess, struct User *user)
 		nick_token = THEME_TOKEN_TAB_AWAY;
 		have_nick_token = TRUE;
 	}
-	else if (prefs.hex_gui_ulist_color)
+	else if (prefs.hex_gui_ulist_color || prefs.hex_text_color_nicks)
 	{
 		int mirc_index = text_color_of (user->nick);
 
@@ -635,7 +635,7 @@ fe_userlist_insert (session *sess, struct User *newuser, gboolean sel)
 		nick_token = THEME_TOKEN_TAB_AWAY;
 		have_nick_token = TRUE;
 	}
-	else if (prefs.hex_gui_ulist_color)
+	else if (prefs.hex_gui_ulist_color || prefs.hex_text_color_nicks)
 	{
 		int mirc_index = text_color_of (newuser->nick);
 

src/fe-gtk/xtext.c

@@ -273,8 +273,6 @@ static void gtk_xtext_render_page (GtkXText * xtext);
 static void gtk_xtext_calc_lines (xtext_buffer *buf, int);
 static gboolean gtk_xtext_is_selecting (GtkXText *xtext);
 static char *gtk_xtext_selection_get_text (GtkXText *xtext, int *len_ret);
-static void gtk_xtext_clipboard_get (GtkClipboard *, GtkSelectionData *, guint, gpointer);
-static void gtk_xtext_clipboard_clear (GtkClipboard *, gpointer);
 static textentry *gtk_xtext_nth (GtkXText *xtext, int line, int *subline);
 static void gtk_xtext_adjustment_changed (GtkAdjustment * adj,
 												GtkXText * xtext);
@@ -1084,29 +1082,9 @@ gtk_xtext_new (const XTextColor *palette, int separator)
 	return GTK_WIDGET (xtext);
 }
 
-static void
-gtk_xtext_release_selections (GtkXText *xtext)
-{
-	GdkAtom selections[] = { GDK_SELECTION_PRIMARY, GDK_SELECTION_SECONDARY };
-	guint i;
-
-	if (!gtk_widget_has_screen (GTK_WIDGET (xtext)))
-		return;
-
-	for (i = 0; i < G_N_ELEMENTS (selections); i++)
-	{
-		GtkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (xtext), selections[i]);
-
-		if (gtk_clipboard_get_owner (clipboard) == G_OBJECT (xtext))
-			gtk_clipboard_clear (clipboard);
-	}
-}
-
 static void
 gtk_xtext_cleanup (GtkXText *xtext)
 {
-	gtk_xtext_release_selections (xtext);
-
 	if (xtext->add_io_tag)
 	{
 		g_source_remove (xtext->add_io_tag);
@@ -1201,7 +1179,6 @@ gtk_xtext_finalize (GObject *object)
 static void
 gtk_xtext_unrealize (GtkWidget * widget)
 {
-	gtk_xtext_release_selections (GTK_XTEXT (widget));
 	backend_deinit (GTK_XTEXT (widget));
 
 	/*
@@ -2766,16 +2743,8 @@ gtk_xtext_set_clip_owner (GtkWidget * xtext, GdkEventButton * event)
 		{
 			gtk_clipboard_set_text (gtk_widget_get_clipboard (xtext, GDK_SELECTION_CLIPBOARD), str, len);
 			
-			/* Let GtkClipboard own the X11 selection window. Making xtext
+			gtk_selection_owner_set (xtext, GDK_SELECTION_PRIMARY, event ? event->time : GDK_CURRENT_TIME);
-			 * the selection owner forces its window native and bypasses
+			gtk_selection_owner_set (xtext, GDK_SELECTION_SECONDARY, event ? event->time : GDK_CURRENT_TIME);
-			 * GTK's toplevel backing buffer on subsequent redraws.
-			 */
-			gtk_clipboard_set_with_owner (gtk_widget_get_clipboard (xtext, GDK_SELECTION_PRIMARY),
-				gtk_xtext_selection_targets, G_N_ELEMENTS (gtk_xtext_selection_targets),
-				gtk_xtext_clipboard_get, gtk_xtext_clipboard_clear, G_OBJECT (xtext));
-			gtk_clipboard_set_with_owner (gtk_widget_get_clipboard (xtext, GDK_SELECTION_SECONDARY),
-				gtk_xtext_selection_targets, G_N_ELEMENTS (gtk_xtext_selection_targets),
-				gtk_xtext_clipboard_get, gtk_xtext_clipboard_clear, G_OBJECT (xtext));
 		}
 
 		g_free (str);
@@ -3203,7 +3172,7 @@ gtk_xtext_selection_get (GtkWidget * widget,
 			if (!window || !GDK_IS_WINDOW (window))
 				break;
 			display = gdk_window_get_display (window);
-			if (!display || !GDK_IS_X11_DISPLAY (display))
+			if (!display)
 				break;
 			GdkAtom encoding;
 			gint format;
@@ -3228,29 +3197,6 @@ gtk_xtext_selection_get (GtkWidget * widget,
 	g_free (stripped);
 }
 
-static void
-gtk_xtext_clipboard_get (GtkClipboard *clipboard, GtkSelectionData *selection_data,
-						 guint info, gpointer owner)
-{
-	int len;
-	char *text = gtk_xtext_selection_get_text (GTK_XTEXT (owner), &len);
-
-	if (text)
-	{
-		gtk_selection_data_set_text (selection_data, text, len);
-		g_free (text);
-	}
-}
-
-static void
-gtk_xtext_clipboard_clear (GtkClipboard *clipboard, gpointer owner)
-{
-	GtkXText *xtext = GTK_XTEXT (owner);
-
-	if (xtext->orig_buffer)
-		gtk_xtext_selection_kill (xtext, NULL);
-}
-
 static gboolean
 gtk_xtext_scroll (GtkWidget *widget, GdkEventScroll *event)
 {

src/fe-text/fe-text.c

@@ -467,9 +467,6 @@ static const GOptionEntry gopt_entries[] =
  {"no-auto",	'a', 0, G_OPTION_ARG_NONE,	&arg_dont_autoconnect, N_("Don't auto connect to servers"), NULL},
  {"cfgdir",	'd', 0, G_OPTION_ARG_STRING,	&arg_cfgdir, N_("Use a different config directory"), "PATH"},
  {"no-plugins",	'n', 0, G_OPTION_ARG_NONE,	&arg_skip_plugins, N_("Don't auto load any plugins"), NULL},
-#ifdef __linux__
- {"run-as-root", 0, 0, G_OPTION_ARG_NONE, &arg_run_as_root, N_("Allow ZoiteChat to run as root (unsafe)"), NULL},
-#endif
  {"plugindir",	'p', 0, G_OPTION_ARG_NONE,	&arg_show_autoload, N_("Show plugin/script auto-load directory"), NULL},
  {"configdir",	'u', 0, G_OPTION_ARG_NONE,	&arg_show_config, N_("Show user config directory"), NULL},
  {"url",	 0,  G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING,	&arg_url, N_("Open an irc://server:port/channel URL"), "URL"},
@@ -478,16 +475,6 @@ static const GOptionEntry gopt_entries[] =
  {NULL}
 };
 
-#ifdef __linux__
-void
-fe_root_warning (void)
-{
-	fputs ("ZoiteChat refuses to run as root on Linux.\n"
-	       "Run it as a normal user, or pass --run-as-root to override this protection.\n",
-	       stderr);
-}
-#endif
-
 int
 fe_args (int argc, char *argv[])
 {