X-Git-Url: http://gitweb.michael.orlitzky.com/?p=xfce4-hdaps.git;a=blobdiff_plain;f=panel-plugin%2Fxfce4-hdaps-dialogs.c;h=dc104fdff75f67329b4d84747e93d99fc4e8fe73;hp=7a4f73754cafd82090a0e1a80ff829d0ffa204d1;hb=c4bc79ca98f1f556a39ddba593d01a09b7b4bc9f;hpb=c2192722c30e86449a7598eb9c962af39ed2a7e0

diff --git a/panel-plugin/xfce4-hdaps-dialogs.c b/panel-plugin/xfce4-hdaps-dialogs.c
index 7a4f737..dc104fd 100644
--- a/panel-plugin/xfce4-hdaps-dialogs.c
+++ b/panel-plugin/xfce4-hdaps-dialogs.c
@@ -62,7 +62,7 @@ static void hdaps_configure_response(GtkWidget   *dialog,
        want to save any settings that may have changed. */
     g_object_set_data(G_OBJECT(hdaps->plugin), "dialog", NULL);
     hdaps->poll_frequency = gtk_spin_button_get_value_as_int((GtkSpinButton*)hdaps->sb_poll_frequency);
-    hdaps->device_name = gtk_combo_box_get_active_text((GtkComboBox*)hdaps->cb_device_name);
+    hdaps->device_name = gtk_combo_box_text_get_active_text((GtkComboBoxText*)hdaps->cb_device_name);
     snprintf(hdaps->sysfs_file, FILENAME_MAX, UNLOAD_HEADS_FMT, hdaps->device_name);
     hdaps_save(hdaps->plugin, hdaps);
     hdaps_reset_timeout(hdaps);
@@ -101,7 +101,7 @@ void hdaps_configure(XfcePanelPlugin *plugin,
   /* Create the dialog */
   dialog = xfce_titled_dialog_new_with_buttons(_("Hdaps Plugin"),
 					       GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))),
-					       GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+					       GTK_DIALOG_DESTROY_WITH_PARENT,
 					       GTK_STOCK_HELP, GTK_RESPONSE_HELP,
 					       GTK_STOCK_SAVE, GTK_RESPONSE_OK,
 					       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -134,7 +134,8 @@ void hdaps_configure(XfcePanelPlugin *plugin,
 
   label = gtk_label_new(_("Poll Frequency:"));
   gtk_size_group_add_widget(sg, label);
-  gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+  gtk_widget_set_halign(label, 0.0);
+  gtk_widget_set_valign(label, 0.5);
   gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
   hdaps->sb_poll_frequency = gtk_spin_button_new_with_range(100, 5000, 100);
@@ -152,14 +153,15 @@ void hdaps_configure(XfcePanelPlugin *plugin,
 
   label = gtk_label_new(_("Device Name:"));
   gtk_size_group_add_widget(sg, label);
-  gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+  gtk_widget_set_halign(label, 0.0);
+  gtk_widget_set_valign(label, 0.5);
   gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
-  hdaps->cb_device_name = gtk_combo_box_new_text();
+  hdaps->cb_device_name = gtk_combo_box_text_new();
 
   /* Add the current device name, it should always be available.
      Oh, and it should be the default, too. */
-  gtk_combo_box_append_text((GtkComboBox*)hdaps->cb_device_name, hdaps->device_name);
+  gtk_combo_box_text_append_text((GtkComboBoxText*)hdaps->cb_device_name, hdaps->device_name);
   
   /* This function takes an index, and 0 should be the first
      (only) index at this point. */
@@ -177,7 +179,7 @@ void hdaps_configure(XfcePanelPlugin *plugin,
        the only entry. Therefore, to avoid duplicates, we only
        have to avoid adding the current device name a second time. */
     if (strcmp(hdaps_devices[list_idx], hdaps->device_name) != 0) {
-      gtk_combo_box_append_text((GtkComboBox*)hdaps->cb_device_name, hdaps_devices[list_idx]);
+      gtk_combo_box_text_append_text((GtkComboBoxText*)hdaps->cb_device_name, hdaps_devices[list_idx]);
     }
   }