Ticket #180: 0002-Add-aui_service_dialog_set_service_type_name-and-re.patch

a/avahi-ui/avahi-ui.c

@@ -73 +73 @@
-    GtkWidget *service_progress_bar;
-
-    GtkListStore *service_list_store, *domain_list_store;
+    GHashTable *service_type_names;
-
-    guint service_pulse_timeout;
-    guint domain_pulse_timeout;
@@ -410 +411 @@
-
-        case AVAHI_BROWSER_NEW: {
-            gchar *ifs;
-
+ = NULL
-            char ifname[IFNAMSIZ];
-            GtkTreeIter iter;
-            GtkTreeSelection *selection;
@@ -420 +421 @@
-
-            ifs = g_strdup_printf("%s %s", ifname, protocol == AVAHI_PROTO_INET ? "IPv4" : "IPv6");
-
+            if (d->priv->service_type_names)
+                pretty_type = g_hash_table_lookup (d->priv->service_type_names, type);
+
+            if (!pretty_type) {
-#if defined(HAVE_GDBM) || defined(HAVE_DBM)
-
+    
-#else
-
-
+
+
+
-            
-            gtk_list_store_append(d->priv->service_list_store, &iter);
-
@@ -817 +823 @@
-    if (d->priv->glib_poll)
-        avahi_glib_poll_free(d->priv->glib_poll);
-
+    if (d->priv->service_list_store)
+        g_object_unref(d->priv->service_list_store);
+    if (d->priv->domain_list_store)
+        g_object_unref(d->priv->domain_list_store);
+    if (d->priv->service_type_names)
+        g_hash_table_unref (d->priv->service_type_names);
+
-    g_free(d->priv);
-    d->priv = NULL;
-
@@ -1089 +1102 @@
-    p->forward_response_id = GTK_RESPONSE_NONE;
-
-    p->service_list_store = p->domain_list_store = NULL;
+    p->service_type_names = NULL;
-    
-    gtk_widget_push_composite_child();
-
@@ -1236 +1250 @@
-    return (const char* const*) d->priv->browse_service_types;
-}
-
+void aui_service_dialog_set_service_type_name(AuiServiceDialog *d, const gchar *type, const gchar *name) {
+    GtkTreeModel *m = NULL;
+    GtkTreeIter iter;
+
+    g_return_if_fail(AUI_IS_SERVICE_DIALOG(d));
+    g_return_if_fail(NULL != type);
+    g_return_if_fail(NULL != name);
+
+    if (NULL == d->priv->service_type_names)
+        d->priv->service_type_names = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
+
+    g_hash_table_insert(d->priv->service_type_names, g_strdup(type), g_strdup(name));
+
+    if (d->priv->service_list_store)
+        m = GTK_TREE_MODEL(d->priv->service_list_store);
+
+    if (m && gtk_tree_model_get_iter_first(m, &iter)) {
+        do {
+            char *stored_type = NULL;
+
+            gtk_tree_model_get(m, &iter, SERVICE_COLUMN_TYPE, &stored_type, -1);
+
+            if (stored_type && g_str_equal(stored_type, type))
+                gtk_list_store_set(d->priv->service_list_store, &iter, SERVICE_COLUMN_PRETTY_TYPE, name, -1);
+        } while (gtk_tree_model_iter_next(m, &iter));
+    }
+}
+
-void aui_service_dialog_set_domain(AuiServiceDialog *d, const char *domain) {
-    g_return_if_fail(AUI_IS_SERVICE_DIALOG(d));
-    g_return_if_fail(!domain || is_valid_domain_suffix(domain));

a/avahi-ui/avahi-ui.h

@@ -95 +95 @@
-void aui_service_dialog_set_browse_service_typesv(AuiServiceDialog *d, const gchar *const*type);
-/** Return the service types currently browsed for. i.e. what was previously set with aui_service_dialog_set_browse_service_types() */
-const gchar*const* aui_service_dialog_get_browse_service_types(AuiServiceDialog *d);
+void aui_service_dialog_set_service_type_name(AuiServiceDialog *d, const gchar *type, const gchar *name);
-
-/** @} */
-

a/avahi-ui/bssh.c

@@ -41 +41 @@
-    GtkWidget *d;
-
-    gtk_init(&argc, &argv);
-
-
+
+
+
+
+
+
+
+
-        d = aui_service_dialog_new("Choose VNC server", NULL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT, NULL);
-        aui_service_dialog_set_browse_service_types(AUI_SERVICE_DIALOG(d), "_rfb._tcp", NULL);
-    } else {
@@ -59 +65 @@
-        char a[AVAHI_ADDRESS_STR_MAX], *u = NULL, *n = NULL;
-        char *h = NULL, *t = NULL;
-        const AvahiStringList *txt;
-
+
-        t = g_strdup(aui_service_dialog_get_service_type(AUI_SERVICE_DIALOG(d)));
-        n = g_strdup(aui_service_dialog_get_service_name(AUI_SERVICE_DIALOG(d)));
-